* lisp/finder.el (finder-known-keywords): Add keyword "vc"

for version control.

* add-log.el, cvs-status.el, diff.el, diff-mode.el, ediff.el,
* emerge.el, log-edit.el, log-view.el, pcvs.el, smerge-mode.el,
* vc-annotate.el, vc-bzr.el, vc-dir.el, vc-dispatcher.el, vc-git.el,
* vc-hg.el, vc-mtn.el, vc.el: Add keyword "vc".

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 813587dba80715841ddc9310917aff177b4e4987..08b90b6f4c062f5820c1c0cae76c94349c5faebd 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2010-06-11  Juri Linkov  <juri@jurta.org>
+
+       * finder.el (finder-known-keywords): Add keyword "vc"
+       for version control.
+
+       * add-log.el, cvs-status.el, diff.el, diff-mode.el, ediff.el,
+       * emerge.el, log-edit.el, log-view.el, pcvs.el, smerge-mode.el,
+       * vc-annotate.el, vc-bzr.el, vc-dir.el, vc-dispatcher.el, vc-git.el,
+       * vc-hg.el, vc-mtn.el, vc.el: Add keyword "vc".
+
 2010-06-11  Juri Linkov  <juri@jurta.org>
 
        Move version control related files to the "vc" subdirectory.

diff --git a/lisp/finder.el b/lisp/finder.el
index 2de8e2e01a725c60e16626557534cff728fa112a..b7eccf3ac70c123de4a9ad5f633584940641f12f 100644 (file)
--- a/lisp/finder.el
+++ b/lisp/finder.el
@@ -76,6 +76,7 @@
     (tex       . "supporting code for the TeX formatter")
     (tools     . "programming tools")
     (unix      . "front-ends/assistants for, or emulators of, UNIX-like features")
+    (vc                . "version control")
     (wp                . "word processing")
     ))
 

diff --git a/lisp/vc/add-log.el b/lisp/vc/add-log.el
index 88277e666406823ea769eeb76a10fc8b4148cba3..cf391b2f9ac2354b5212de08fcccc6826b6e0b6e 100644 (file)
--- a/lisp/vc/add-log.el
+++ b/lisp/vc/add-log.el
@@ -5,7 +5,7 @@
 ;;   Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
-;; Keywords: tools
+;; Keywords: vc tools
 
 ;; This file is part of GNU Emacs.
 

diff --git a/lisp/vc/cvs-status.el b/lisp/vc/cvs-status.el
index e5a30684eb0f134a47fe0bb31008c49381833031..b0e66c055acc1f7b909fdd165977c981c2993dd2 100644 (file)
--- a/lisp/vc/cvs-status.el
+++ b/lisp/vc/cvs-status.el
@@ -4,7 +4,7 @@
 ;;   2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
-;; Keywords: pcl-cvs cvs status tree tools
+;; Keywords: pcl-cvs cvs status tree vc tools
 
 ;; This file is part of GNU Emacs.
 

diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index 75ea98ba911794b4c785122cb977305650e9a870..adc5a2a0455e29e05e9a5874b52b4506dfacd3c7 100644 (file)
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -4,7 +4,7 @@
 ;;   2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
-;; Keywords: convenience patch diff
+;; Keywords: convenience patch diff vc
 
 ;; This file is part of GNU Emacs.
 

diff --git a/lisp/vc/diff.el b/lisp/vc/diff.el
index 0206c17e770365411d35682f32b0059a9bae94b1..e79e72c8b0d62f78ac0c06bae4bf7142cd78b36a 100644 (file)
--- a/lisp/vc/diff.el
+++ b/lisp/vc/diff.el
@@ -6,7 +6,7 @@
 ;; Author: Frank Bresz
 ;; (according to authors.el)
 ;; Maintainer: FSF
-;; Keywords: unix, tools
+;; Keywords: unix, vc, tools
 
 ;; This file is part of GNU Emacs.
 

diff --git a/lisp/vc/ediff.el b/lisp/vc/ediff.el
index 97dc537cd7e3ed9ed4de05fa21ae4e2322b66a60..cb0d6444b7921cd3f9e32d87b5a464230b068be4 100644 (file)
--- a/lisp/vc/ediff.el
+++ b/lisp/vc/ediff.el
@@ -5,7 +5,7 @@
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 ;; Created: February 2, 1994
-;; Keywords: comparing, merging, patching, tools, unix
+;; Keywords: comparing, merging, patching, vc, tools, unix
 
 ;; Yoni Rabkin <yoni@rabkins.net> contacted the maintainer of this
 ;; file on 20/3/2008, and the maintainer agreed that when a bug is

diff --git a/lisp/vc/emerge.el b/lisp/vc/emerge.el
index 997077aa08f16c7de20c5510b9c8a73e5acf0694..4946df6dcd3ebd9cb76a942f13f0adb821458302 100644 (file)
--- a/lisp/vc/emerge.el
+++ b/lisp/vc/emerge.el
@@ -5,7 +5,7 @@
 ;; This file is part of GNU Emacs.
 
 ;; Author: Dale R. Worley <worley@world.std.com>
-;; Keywords: unix, tools
+;; Keywords: unix, vc, tools
 
 ;; This software was created by Dale R. Worley and is
 ;; distributed free of charge.  It is placed in the public domain and

diff --git a/lisp/vc/log-edit.el b/lisp/vc/log-edit.el
index 0ee2386e3c5724e5939a179c6cc6893f818755a7..c3a2893717048395ed544afe66f76ebe9a25365c 100644 (file)
--- a/lisp/vc/log-edit.el
+++ b/lisp/vc/log-edit.el
@@ -4,7 +4,7 @@
 ;;   2008, 2009, 2010  Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
-;; Keywords: pcl-cvs cvs commit log
+;; Keywords: pcl-cvs cvs commit log vc
 
 ;; This file is part of GNU Emacs.
 

diff --git a/lisp/vc/log-view.el b/lisp/vc/log-view.el
index 233fc3fccc289249a945f6752d2e0f6cf891141f..3805df2f00b856e9824c7b58d12d38e9ccda6d1f 100644 (file)
--- a/lisp/vc/log-view.el
+++ b/lisp/vc/log-view.el
@@ -4,7 +4,7 @@
 ;;   2008, 2009, 2010  Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
-;; Keywords: rcs, sccs, cvs, log, version control, tools
+;; Keywords: rcs, sccs, cvs, log, vc, tools
 
 ;; This file is part of GNU Emacs.
 

diff --git a/lisp/vc/pcvs.el b/lisp/vc/pcvs.el
index 28c24847b4d55bb139273920c149c303376fbae9..305e109b6d6e217fd779cbd033b9a9cae1eb377c 100644 (file)
--- a/lisp/vc/pcvs.el
+++ b/lisp/vc/pcvs.el
@@ -13,7 +13,7 @@
 ;;     (Greg Klanderman) greg@alphatech.com
 ;;     (Jari Aalto+mail.emacs) jari.aalto@poboxes.com
 ;; Maintainer: (Stefan Monnier) monnier@gnu.org
-;; Keywords: CVS, version control, release management
+;; Keywords: CVS, vc, release management
 
 ;; This file is part of GNU Emacs.
 

diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el
index e9cba88ea1a8ddb40195b8241142d320c16366ec..6e72071b6a0b37d3e9128b00276245841bb35703 100644 (file)
--- a/lisp/vc/smerge-mode.el
+++ b/lisp/vc/smerge-mode.el
@@ -4,7 +4,7 @@
 ;;   2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
-;; Keywords: tools revision-control merge diff3 cvs conflict
+;; Keywords: vc, tools, revision control, merge, diff3, cvs, conflict
 
 ;; This file is part of GNU Emacs.
 

diff --git a/lisp/vc/vc-annotate.el b/lisp/vc/vc-annotate.el
index 1878fe8740f595438bd180374cd5ba2c4db11cec..d21d40d50f2f01d1bad96da373a38449ae2e36f2 100644 (file)
--- a/lisp/vc/vc-annotate.el
+++ b/lisp/vc/vc-annotate.el
@@ -5,7 +5,7 @@
 
 ;; Author:     Martin Lorentzson  <emwson@emw.ericsson.se>
 ;; Maintainer: FSF
-;; Keywords: tools
+;; Keywords: vc tools
 
 ;; This file is part of GNU Emacs.
 

diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el
index 39736bb0377c84e153da705ea0949a82cefb80fe..bea856b28e2f784f3162e2ad5573183222dfbc5b 100644 (file)
--- a/lisp/vc/vc-bzr.el
+++ b/lisp/vc/vc-bzr.el
@@ -4,7 +4,7 @@
 
 ;; Author: Dave Love <fx@gnu.org>
 ;;        Riccardo Murri <riccardo.murri@gmail.com>
-;; Keywords: tools
+;; Keywords: vc tools
 ;; Created: Sept 2006
 ;; Version: 2008-01-04 (Bzr revno 25)
 ;; URL: http://launchpad.net/vc-bzr

diff --git a/lisp/vc/vc-dir.el b/lisp/vc/vc-dir.el
index 3d6bd328f16f166bfa54b9a08281058dd2012abb..161013fbae09cfe26e50f25bf7b3d55e1d1a19d8 100644 (file)
--- a/lisp/vc/vc-dir.el
+++ b/lisp/vc/vc-dir.el
@@ -4,7 +4,7 @@
 ;;   Free Software Foundation, Inc.
 
 ;; Author:   Dan Nicolaescu <dann@ics.uci.edu>
-;; Keywords: tools
+;; Keywords: vc tools
 
 ;; This file is part of GNU Emacs.
 

diff --git a/lisp/vc/vc-dispatcher.el b/lisp/vc/vc-dispatcher.el
index d5def4459d6614e7d627281ec279808a0722199a..0b7851f0a85c556a8f0312142a62cd0825ce27bc 100644 (file)
--- a/lisp/vc/vc-dispatcher.el
+++ b/lisp/vc/vc-dispatcher.el
@@ -5,7 +5,7 @@
 
 ;; Author:     FSF (see below for full credits)
 ;; Maintainer: Eric S. Raymond <esr@thyrsus.com>
-;; Keywords: tools
+;; Keywords: vc tools
 
 ;; This file is part of GNU Emacs.
 

diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index 780afd9db2705d0beb57af162b451ed467cb237a..6129b21c32451ce6d580c016fcbb8ef359c40ff5 100644 (file)
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
 ;; Author: Alexandre Julliard <julliard@winehq.org>
-;; Keywords: tools
+;; Keywords: vc tools
 
 ;; This file is part of GNU Emacs.
 

diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el
index d0f56f27263fa89d7b916970b617928eb0e1dd38..8504309e334ea67accb9698ed4f678789652b45c 100644 (file)
--- a/lisp/vc/vc-hg.el
+++ b/lisp/vc/vc-hg.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
 ;; Author: Ivan Kanis
-;; Keywords: tools
+;; Keywords: vc tools
 
 ;; This file is part of GNU Emacs.
 

diff --git a/lisp/vc/vc-mtn.el b/lisp/vc/vc-mtn.el
index 8866ce46f83c8a6a70057752d71acbc1ccee643d..03b651d945019232e420b0106d8a8e7be38ce2da 100644 (file)
--- a/lisp/vc/vc-mtn.el
+++ b/lisp/vc/vc-mtn.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
-;; Keywords:
+;; Keywords: vc
 
 ;; This file is part of GNU Emacs.
 

diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 1e52a3ca66fad57e9f296363c8a956eb330e226f..0d6584fb343b5aee1c6d9b788091dcbc574286c5 100644 (file)
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -6,7 +6,7 @@
 
 ;; Author:     FSF (see below for full credits)
 ;; Maintainer: Andre Spiegel <spiegel@gnu.org>
-;; Keywords: tools
+;; Keywords: vc tools
 
 ;; This file is part of GNU Emacs.