diff options
| author | Romain Francoise <romain@orebokech.com> | 2005-10-26 08:38:07 +0000 |
|---|---|---|
| committer | Romain Francoise <romain@orebokech.com> | 2005-10-26 08:38:07 +0000 |
| commit | 9700a45fa2670160991351d687ce5d2509b05393 (patch) | |
| tree | 7c57c9ca8083011f216e008dd2e8306daaa4a910 | |
| parent | 3cae51964d23e83cef93e6d124ee0b19d92b027b (diff) | |
| download | emacs-9700a45fa2670160991351d687ce5d2509b05393.tar.gz | |
Add 'tools' to file keywords.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/smerge-mode.el | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 28793023492..3f35fff8a33 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2005-10-26 Romain Francoise <romain@orebokech.com> + + * smerge-mode.el: Add 'tools' to file keywords. + 2005-10-26 Nick Roberts <nickrob@snap.net.nz> * progmodes/gud.el (gud-menu-map): Only display gud-until icon diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el index e777f3f8211..87c572372b0 100644 --- a/lisp/smerge-mode.el +++ b/lisp/smerge-mode.el @@ -4,7 +4,7 @@ ;; 2004, 2005 Free Software Foundation, Inc. ;; Author: Stefan Monnier <monnier@cs.yale.edu> -;; Keywords: revision-control merge diff3 cvs conflict +;; Keywords: tools revision-control merge diff3 cvs conflict ;; This file is part of GNU Emacs. |