Mercurial > emacs
changeset 66458:f2be1560adf2
Add 'tools' to file keywords.
author | Romain Francoise <romain@orebokech.com> |
---|---|
date | Wed, 26 Oct 2005 08:38:07 +0000 |
parents | 902db04fb1b3 |
children | bdc911746f64 |
files | lisp/ChangeLog lisp/smerge-mode.el |
diffstat | 2 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Wed Oct 26 01:02:31 2005 +0000 +++ b/lisp/ChangeLog Wed Oct 26 08:38:07 2005 +0000 @@ -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
--- a/lisp/smerge-mode.el Wed Oct 26 01:02:31 2005 +0000 +++ b/lisp/smerge-mode.el Wed Oct 26 08:38:07 2005 +0000 @@ -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.