From: Romain Francoise <romain@orebokech.com>
Date: Wed, 26 Oct 2005 08:38:07 +0000 (+0000)
Subject: Add 'tools' to file keywords.
X-Git-Tag: emacs-pretest-22.0.90~6277
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9700a45fa2670160991351d687ce5d2509b05393;p=emacs.git

Add 'tools' to file keywords.
---

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.