From 9766adfbca737008fd55847214c0a973b3b37982 Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Fri, 11 Jun 2010 22:09:57 +0300 Subject: [PATCH] * 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". --- lisp/ChangeLog | 10 ++++++++++ lisp/finder.el | 1 + lisp/vc/add-log.el | 2 +- lisp/vc/cvs-status.el | 2 +- lisp/vc/diff-mode.el | 2 +- lisp/vc/diff.el | 2 +- lisp/vc/ediff.el | 2 +- lisp/vc/emerge.el | 2 +- lisp/vc/log-edit.el | 2 +- lisp/vc/log-view.el | 2 +- lisp/vc/pcvs.el | 2 +- lisp/vc/smerge-mode.el | 2 +- lisp/vc/vc-annotate.el | 2 +- lisp/vc/vc-bzr.el | 2 +- lisp/vc/vc-dir.el | 2 +- lisp/vc/vc-dispatcher.el | 2 +- lisp/vc/vc-git.el | 2 +- lisp/vc/vc-hg.el | 2 +- lisp/vc/vc-mtn.el | 2 +- lisp/vc/vc.el | 2 +- 20 files changed, 29 insertions(+), 18 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 813587dba80..08b90b6f4c0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,13 @@ +2010-06-11 Juri Linkov + + * 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 Move version control related files to the "vc" subdirectory. diff --git a/lisp/finder.el b/lisp/finder.el index 2de8e2e01a7..b7eccf3ac70 100644 --- 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 88277e66640..cf391b2f9ac 100644 --- 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 e5a30684eb0..b0e66c055ac 100644 --- 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 -;; 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 75ea98ba911..adc5a2a0455 100644 --- 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 -;; 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 0206c17e770..e79e72c8b0d 100644 --- 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 97dc537cd7e..cb0d6444b79 100644 --- a/lisp/vc/ediff.el +++ b/lisp/vc/ediff.el @@ -5,7 +5,7 @@ ;; Author: Michael Kifer ;; Created: February 2, 1994 -;; Keywords: comparing, merging, patching, tools, unix +;; Keywords: comparing, merging, patching, vc, tools, unix ;; Yoni Rabkin 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 997077aa08f..4946df6dcd3 100644 --- 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 -;; 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 0ee2386e3c5..c3a28937170 100644 --- 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 -;; 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 233fc3fccc2..3805df2f00b 100644 --- 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 -;; 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 28c24847b4d..305e109b6d6 100644 --- 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 e9cba88ea1a..6e72071b6a0 100644 --- 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 -;; 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 1878fe8740f..d21d40d50f2 100644 --- a/lisp/vc/vc-annotate.el +++ b/lisp/vc/vc-annotate.el @@ -5,7 +5,7 @@ ;; Author: Martin Lorentzson ;; 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 39736bb0377..bea856b28e2 100644 --- a/lisp/vc/vc-bzr.el +++ b/lisp/vc/vc-bzr.el @@ -4,7 +4,7 @@ ;; Author: Dave Love ;; Riccardo Murri -;; 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 3d6bd328f16..161013fbae0 100644 --- a/lisp/vc/vc-dir.el +++ b/lisp/vc/vc-dir.el @@ -4,7 +4,7 @@ ;; Free Software Foundation, Inc. ;; Author: Dan Nicolaescu -;; 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 d5def4459d6..0b7851f0a85 100644 --- 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 -;; 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 780afd9db27..6129b21c324 100644 --- 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 -;; 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 d0f56f27263..8504309e334 100644 --- 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 8866ce46f83..03b651d9450 100644 --- 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 -;; Keywords: +;; Keywords: vc ;; This file is part of GNU Emacs. diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index 1e52a3ca66f..0d6584fb343 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -6,7 +6,7 @@ ;; Author: FSF (see below for full credits) ;; Maintainer: Andre Spiegel -;; Keywords: tools +;; Keywords: vc tools ;; This file is part of GNU Emacs. -- 2.39.2