diff options
| author | Paul Eggert | 2013-01-02 08:13:04 -0800 |
|---|---|---|
| committer | Paul Eggert | 2013-01-02 08:13:04 -0800 |
| commit | 0877d0dc24ee792b9b14592869ea1aa0934aee58 (patch) | |
| tree | 08e9265a1dd95974dc72622a9bef194682c0c716 /lisp/vc | |
| parent | aca3d51dfa45794fa68a2ffb6269e34fcee2ec6c (diff) | |
| parent | d8fb8cce84b923a3289b69549e30958710ac3ebb (diff) | |
| download | emacs-0877d0dc24ee792b9b14592869ea1aa0934aee58.tar.gz emacs-0877d0dc24ee792b9b14592869ea1aa0934aee58.zip | |
Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.ca
Diffstat (limited to 'lisp/vc')
39 files changed, 45 insertions, 42 deletions
diff --git a/lisp/vc/add-log.el b/lisp/vc/add-log.el index 0d2b82cb9a7..f0ea9c68464 100644 --- a/lisp/vc/add-log.el +++ b/lisp/vc/add-log.el | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | ;;; add-log.el --- change log maintenance commands for Emacs | 1 | ;;; add-log.el --- change log maintenance commands for Emacs |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1985-1986, 1988, 1993-1994, 1997-1998, 2000-2012 | 3 | ;; Copyright (C) 1985-1986, 1988, 1993-1994, 1997-1998, 2000-2013 Free |
| 4 | ;; Free Software Foundation, Inc. | 4 | ;; Software Foundation, Inc. |
| 5 | 5 | ||
| 6 | ;; Maintainer: FSF | 6 | ;; Maintainer: FSF |
| 7 | ;; Keywords: vc tools | 7 | ;; Keywords: vc tools |
diff --git a/lisp/vc/compare-w.el b/lisp/vc/compare-w.el index 14612c95b22..2423d322460 100644 --- a/lisp/vc/compare-w.el +++ b/lisp/vc/compare-w.el | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | ;;; compare-w.el --- compare text between windows for Emacs | 1 | ;;; compare-w.el --- compare text between windows for Emacs |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1986, 1989, 1993, 1997, 2001-2012 | 3 | ;; Copyright (C) 1986, 1989, 1993, 1997, 2001-2013 Free Software |
| 4 | ;; Free Software Foundation, Inc. | 4 | ;; Foundation, Inc. |
| 5 | 5 | ||
| 6 | ;; Maintainer: FSF | 6 | ;; Maintainer: FSF |
| 7 | ;; Keywords: convenience files vc | 7 | ;; Keywords: convenience files vc |
diff --git a/lisp/vc/cvs-status.el b/lisp/vc/cvs-status.el index 6c6b18a605d..4f87d1ac44d 100644 --- a/lisp/vc/cvs-status.el +++ b/lisp/vc/cvs-status.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; cvs-status.el --- major mode for browsing `cvs status' output -*- coding: utf-8; lexical-binding: t -*- | 1 | ;;; cvs-status.el --- major mode for browsing `cvs status' output -*- coding: utf-8; lexical-binding: t -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1999-2012 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1999-2013 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> | 5 | ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> |
| 6 | ;; Keywords: pcl-cvs cvs status tree vc tools | 6 | ;; Keywords: pcl-cvs cvs status tree vc tools |
diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el index edd209a7910..940457b6cc0 100644 --- a/lisp/vc/diff-mode.el +++ b/lisp/vc/diff-mode.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; diff-mode.el --- a mode for viewing/editing context diffs -*- lexical-binding: t -*- | 1 | ;;; diff-mode.el --- a mode for viewing/editing context diffs -*- lexical-binding: t -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1998-2012 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1998-2013 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> | 5 | ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> |
| 6 | ;; Keywords: convenience patch diff vc | 6 | ;; Keywords: convenience patch diff vc |
diff --git a/lisp/vc/diff.el b/lisp/vc/diff.el index b1c334ddcfc..d0e496d2d21 100644 --- a/lisp/vc/diff.el +++ b/lisp/vc/diff.el | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | ;;; diff.el --- run `diff' -*- lexical-binding: t -*- | 1 | ;;; diff.el --- run `diff' -*- lexical-binding: t -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1992, 1994, 1996, 2001-2012 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1992, 1994, 1996, 2001-2013 Free Software Foundation, |
| 4 | ;; Inc. | ||
| 4 | 5 | ||
| 5 | ;; Author: Frank Bresz | 6 | ;; Author: Frank Bresz |
| 6 | ;; (according to authors.el) | 7 | ;; (according to authors.el) |
diff --git a/lisp/vc/ediff-diff.el b/lisp/vc/ediff-diff.el index aa7c9007200..b4d986fb036 100644 --- a/lisp/vc/ediff-diff.el +++ b/lisp/vc/ediff-diff.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; ediff-diff.el --- diff-related utilities | 1 | ;;; ediff-diff.el --- diff-related utilities |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1994-2012 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1994-2013 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> | 5 | ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> |
| 6 | ;; Package: ediff | 6 | ;; Package: ediff |
diff --git a/lisp/vc/ediff-help.el b/lisp/vc/ediff-help.el index 8d0f9dd5562..833e84b6cea 100644 --- a/lisp/vc/ediff-help.el +++ b/lisp/vc/ediff-help.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; ediff-help.el --- Code related to the contents of Ediff help buffers | 1 | ;;; ediff-help.el --- Code related to the contents of Ediff help buffers |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1996-2012 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1996-2013 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> | 5 | ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> |
| 6 | ;; Package: ediff | 6 | ;; Package: ediff |
diff --git a/lisp/vc/ediff-hook.el b/lisp/vc/ediff-hook.el index a91c53fb115..cf0f3de44c3 100644 --- a/lisp/vc/ediff-hook.el +++ b/lisp/vc/ediff-hook.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; ediff-hook.el --- setup for Ediff's menus and autoloads | 1 | ;;; ediff-hook.el --- setup for Ediff's menus and autoloads |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1995-2012 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1995-2013 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> | 5 | ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> |
| 6 | ;; Package: ediff | 6 | ;; Package: ediff |
diff --git a/lisp/vc/ediff-init.el b/lisp/vc/ediff-init.el index 65776dfccad..075775923a5 100644 --- a/lisp/vc/ediff-init.el +++ b/lisp/vc/ediff-init.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; ediff-init.el --- Macros, variables, and defsubsts used by Ediff | 1 | ;;; ediff-init.el --- Macros, variables, and defsubsts used by Ediff |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1994-2012 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1994-2013 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> | 5 | ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> |
| 6 | ;; Package: ediff | 6 | ;; Package: ediff |
diff --git a/lisp/vc/ediff-merg.el b/lisp/vc/ediff-merg.el index 9b817b2fbc1..dea872bd142 100644 --- a/lisp/vc/ediff-merg.el +++ b/lisp/vc/ediff-merg.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; ediff-merg.el --- merging utilities | 1 | ;;; ediff-merg.el --- merging utilities |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1994-2012 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1994-2013 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> | 5 | ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> |
| 6 | ;; Package: ediff | 6 | ;; Package: ediff |
diff --git a/lisp/vc/ediff-mult.el b/lisp/vc/ediff-mult.el index 5c471664fdc..3e3bc6c9663 100644 --- a/lisp/vc/ediff-mult.el +++ b/lisp/vc/ediff-mult.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; ediff-mult.el --- support for multi-file/multi-buffer processing in Ediff | 1 | ;;; ediff-mult.el --- support for multi-file/multi-buffer processing in Ediff |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1995-2012 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1995-2013 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> | 5 | ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> |
| 6 | ;; Package: ediff | 6 | ;; Package: ediff |
diff --git a/lisp/vc/ediff-ptch.el b/lisp/vc/ediff-ptch.el index b6a59ce2770..64f4ee4a6ac 100644 --- a/lisp/vc/ediff-ptch.el +++ b/lisp/vc/ediff-ptch.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; ediff-ptch.el --- Ediff's patch support | 1 | ;;; ediff-ptch.el --- Ediff's patch support |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1996-2012 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1996-2013 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> | 5 | ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> |
| 6 | ;; Package: ediff | 6 | ;; Package: ediff |
diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el index 75becfdeccb..2456d6ede41 100644 --- a/lisp/vc/ediff-util.el +++ b/lisp/vc/ediff-util.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; ediff-util.el --- the core commands and utilities of ediff | 1 | ;;; ediff-util.el --- the core commands and utilities of ediff |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1994-2012 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1994-2013 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> | 5 | ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> |
| 6 | ;; Package: ediff | 6 | ;; Package: ediff |
diff --git a/lisp/vc/ediff-vers.el b/lisp/vc/ediff-vers.el index 195b177bbc9..dc004fd1ff1 100644 --- a/lisp/vc/ediff-vers.el +++ b/lisp/vc/ediff-vers.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; ediff-vers.el --- version control interface to Ediff | 1 | ;;; ediff-vers.el --- version control interface to Ediff |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1995-1997, 2001-2012 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1995-1997, 2001-2013 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> | 5 | ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> |
| 6 | ;; Package: ediff | 6 | ;; Package: ediff |
diff --git a/lisp/vc/ediff-wind.el b/lisp/vc/ediff-wind.el index d7118ad7970..81109906262 100644 --- a/lisp/vc/ediff-wind.el +++ b/lisp/vc/ediff-wind.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; ediff-wind.el --- window manipulation utilities | 1 | ;;; ediff-wind.el --- window manipulation utilities |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1994-1997, 2000-2012 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1994-1997, 2000-2013 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> | 5 | ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> |
| 6 | ;; Package: ediff | 6 | ;; Package: ediff |
diff --git a/lisp/vc/ediff.el b/lisp/vc/ediff.el index 6929bfb6e0f..aba23b06535 100644 --- a/lisp/vc/ediff.el +++ b/lisp/vc/ediff.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; ediff.el --- a comprehensive visual interface to diff & patch | 1 | ;;; ediff.el --- a comprehensive visual interface to diff & patch |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1994-2012 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1994-2013 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> | 5 | ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> |
| 6 | ;; Created: February 2, 1994 | 6 | ;; Created: February 2, 1994 |
diff --git a/lisp/vc/log-edit.el b/lisp/vc/log-edit.el index 3c34a762a1b..f8e753772e4 100644 --- a/lisp/vc/log-edit.el +++ b/lisp/vc/log-edit.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; log-edit.el --- Major mode for editing CVS commit messages -*- lexical-binding: t -*- | 1 | ;;; log-edit.el --- Major mode for editing CVS commit messages -*- lexical-binding: t -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1999-2012 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1999-2013 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> | 5 | ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> |
| 6 | ;; Keywords: pcl-cvs cvs commit log vc | 6 | ;; Keywords: pcl-cvs cvs commit log vc |
| @@ -319,7 +319,9 @@ automatically." | |||
| 319 | "AList of known headers and the face to use to highlight them.") | 319 | "AList of known headers and the face to use to highlight them.") |
| 320 | 320 | ||
| 321 | (defconst log-edit-header-contents-regexp | 321 | (defconst log-edit-header-contents-regexp |
| 322 | "[ \t]*\\(.*\\(\n[ \t].*\\)*\\)\n?") | 322 | "[ \t]*\\(.*\\(\n[ \t].*\\)*\\)\n?" |
| 323 | "Regular expression matching a header field. | ||
| 324 | The first subexpression is the actual text of the field.") | ||
| 323 | 325 | ||
| 324 | (defun log-edit-match-to-eoh (_limit) | 326 | (defun log-edit-match-to-eoh (_limit) |
| 325 | ;; FIXME: copied from message-match-to-eoh. | 327 | ;; FIXME: copied from message-match-to-eoh. |
diff --git a/lisp/vc/log-view.el b/lisp/vc/log-view.el index 9dda78d0314..b74ff77bc41 100644 --- a/lisp/vc/log-view.el +++ b/lisp/vc/log-view.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; log-view.el --- Major mode for browsing RCS/CVS/SCCS log output -*- lexical-binding: t -*- | 1 | ;;; log-view.el --- Major mode for browsing RCS/CVS/SCCS log output -*- lexical-binding: t -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1999-2012 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1999-2013 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> | 5 | ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> |
| 6 | ;; Keywords: rcs, sccs, cvs, log, vc, tools | 6 | ;; Keywords: rcs, sccs, cvs, log, vc, tools |
diff --git a/lisp/vc/pcvs-defs.el b/lisp/vc/pcvs-defs.el index b3c1f8c1343..9dc378e4e27 100644 --- a/lisp/vc/pcvs-defs.el +++ b/lisp/vc/pcvs-defs.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; pcvs-defs.el --- variable definitions for PCL-CVS | 1 | ;;; pcvs-defs.el --- variable definitions for PCL-CVS |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1991-2012 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1991-2013 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> | 5 | ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> |
| 6 | ;; Keywords: pcl-cvs | 6 | ;; Keywords: pcl-cvs |
diff --git a/lisp/vc/pcvs-info.el b/lisp/vc/pcvs-info.el index e863096d587..2719a7fb54a 100644 --- a/lisp/vc/pcvs-info.el +++ b/lisp/vc/pcvs-info.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; pcvs-info.el --- internal representation of a fileinfo entry | 1 | ;;; pcvs-info.el --- internal representation of a fileinfo entry |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1991-2012 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1991-2013 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> | 5 | ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> |
| 6 | ;; Keywords: pcl-cvs | 6 | ;; Keywords: pcl-cvs |
diff --git a/lisp/vc/pcvs-parse.el b/lisp/vc/pcvs-parse.el index dd448b9d480..c267f32b2d7 100644 --- a/lisp/vc/pcvs-parse.el +++ b/lisp/vc/pcvs-parse.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; pcvs-parse.el --- the CVS output parser | 1 | ;;; pcvs-parse.el --- the CVS output parser |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1991-2012 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1991-2013 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> | 5 | ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> |
| 6 | ;; Keywords: pcl-cvs | 6 | ;; Keywords: pcl-cvs |
diff --git a/lisp/vc/pcvs-util.el b/lisp/vc/pcvs-util.el index fdef490d4a2..28ae4ed3de3 100644 --- a/lisp/vc/pcvs-util.el +++ b/lisp/vc/pcvs-util.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; pcvs-util.el --- utility functions for PCL-CVS -*- byte-compile-dynamic: t -*- | 1 | ;;; pcvs-util.el --- utility functions for PCL-CVS -*- byte-compile-dynamic: t -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1991-2012 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1991-2013 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> | 5 | ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> |
| 6 | ;; Keywords: pcl-cvs | 6 | ;; Keywords: pcl-cvs |
diff --git a/lisp/vc/pcvs.el b/lisp/vc/pcvs.el index 4bc3eaf8c2c..52dc7edfa2d 100644 --- a/lisp/vc/pcvs.el +++ b/lisp/vc/pcvs.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; pcvs.el --- a front-end to CVS | 1 | ;;; pcvs.el --- a front-end to CVS |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1991-2012 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1991-2013 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: (The PCL-CVS Trust) pcl-cvs@cyclic.com | 5 | ;; Author: (The PCL-CVS Trust) pcl-cvs@cyclic.com |
| 6 | ;; (Per Cederqvist) ceder@lysator.liu.se | 6 | ;; (Per Cederqvist) ceder@lysator.liu.se |
diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el index 7037b606fe7..f61e97216a9 100644 --- a/lisp/vc/smerge-mode.el +++ b/lisp/vc/smerge-mode.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; smerge-mode.el --- Minor mode to resolve diff3 conflicts -*- lexical-binding: t -*- | 1 | ;;; smerge-mode.el --- Minor mode to resolve diff3 conflicts -*- lexical-binding: t -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1999-2012 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1999-2013 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> | 5 | ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> |
| 6 | ;; Keywords: vc, tools, revision control, merge, diff3, cvs, conflict | 6 | ;; Keywords: vc, tools, revision control, merge, diff3, cvs, conflict |
diff --git a/lisp/vc/vc-annotate.el b/lisp/vc/vc-annotate.el index 1b98194e74a..8af488789de 100644 --- a/lisp/vc/vc-annotate.el +++ b/lisp/vc/vc-annotate.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; vc-annotate.el --- VC Annotate Support | 1 | ;;; vc-annotate.el --- VC Annotate Support |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1997-1998, 2000-2012 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1997-1998, 2000-2013 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Martin Lorentzson <emwson@emw.ericsson.se> | 5 | ;; Author: Martin Lorentzson <emwson@emw.ericsson.se> |
| 6 | ;; Maintainer: FSF | 6 | ;; Maintainer: FSF |
diff --git a/lisp/vc/vc-arch.el b/lisp/vc/vc-arch.el index 2e20d97e21d..3dbaae52b37 100644 --- a/lisp/vc/vc-arch.el +++ b/lisp/vc/vc-arch.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; vc-arch.el --- VC backend for the Arch version-control system -*- lexical-binding: t -*- | 1 | ;;; vc-arch.el --- VC backend for the Arch version-control system -*- lexical-binding: t -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2004-2012 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2004-2013 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: FSF (see vc.el for full credits) | 5 | ;; Author: FSF (see vc.el for full credits) |
| 6 | ;; Maintainer: Stefan Monnier <monnier@gnu.org> | 6 | ;; Maintainer: Stefan Monnier <monnier@gnu.org> |
diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el index 74a61548d8b..f436d300089 100644 --- a/lisp/vc/vc-bzr.el +++ b/lisp/vc/vc-bzr.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; vc-bzr.el --- VC backend for the bzr revision control system -*- lexical-binding: t -*- | 1 | ;;; vc-bzr.el --- VC backend for the bzr revision control system -*- lexical-binding: t -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2006-2012 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2006-2013 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Dave Love <fx@gnu.org> | 5 | ;; Author: Dave Love <fx@gnu.org> |
| 6 | ;; Riccardo Murri <riccardo.murri@gmail.com> | 6 | ;; Riccardo Murri <riccardo.murri@gmail.com> |
diff --git a/lisp/vc/vc-cvs.el b/lisp/vc/vc-cvs.el index ae1a3cf92f8..d90596baca0 100644 --- a/lisp/vc/vc-cvs.el +++ b/lisp/vc/vc-cvs.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; vc-cvs.el --- non-resident support for CVS version-control -*- lexical-binding: t -*- | 1 | ;;; vc-cvs.el --- non-resident support for CVS version-control -*- lexical-binding: t -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1995, 1998-2012 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1995, 1998-2013 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: FSF (see vc.el for full credits) | 5 | ;; Author: FSF (see vc.el for full credits) |
| 6 | ;; Maintainer: Andre Spiegel <spiegel@gnu.org> | 6 | ;; Maintainer: Andre Spiegel <spiegel@gnu.org> |
diff --git a/lisp/vc/vc-dav.el b/lisp/vc/vc-dav.el index 6cd2b1ddf76..83fc0bceb66 100644 --- a/lisp/vc/vc-dav.el +++ b/lisp/vc/vc-dav.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; vc-dav.el --- vc.el support for WebDAV | 1 | ;;; vc-dav.el --- vc.el support for WebDAV |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2001, 2004-2012 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2001, 2004-2013 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Bill Perry <wmperry@gnu.org> | 5 | ;; Author: Bill Perry <wmperry@gnu.org> |
| 6 | ;; Maintainer: Bill Perry <wmperry@gnu.org> | 6 | ;; Maintainer: Bill Perry <wmperry@gnu.org> |
diff --git a/lisp/vc/vc-dir.el b/lisp/vc/vc-dir.el index a9df6fdee8d..d10e3934680 100644 --- a/lisp/vc/vc-dir.el +++ b/lisp/vc/vc-dir.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; vc-dir.el --- Directory status display under VC -*- lexical-binding: t -*- | 1 | ;;; vc-dir.el --- Directory status display under VC -*- lexical-binding: t -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2007-2012 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2007-2013 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Dan Nicolaescu <dann@ics.uci.edu> | 5 | ;; Author: Dan Nicolaescu <dann@ics.uci.edu> |
| 6 | ;; Keywords: vc tools | 6 | ;; Keywords: vc tools |
diff --git a/lisp/vc/vc-dispatcher.el b/lisp/vc/vc-dispatcher.el index d8a7a296cf1..b03619e03d9 100644 --- a/lisp/vc/vc-dispatcher.el +++ b/lisp/vc/vc-dispatcher.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; vc-dispatcher.el -- generic command-dispatcher facility. | 1 | ;;; vc-dispatcher.el -- generic command-dispatcher facility. |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2008-2012 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2008-2013 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: FSF (see below for full credits) | 5 | ;; Author: FSF (see below for full credits) |
| 6 | ;; Maintainer: Eric S. Raymond <esr@thyrsus.com> | 6 | ;; Maintainer: Eric S. Raymond <esr@thyrsus.com> |
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index 08b48fa7b40..29f7aaa5480 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; vc-git.el --- VC backend for the git version control system -*- lexical-binding: t -*- | 1 | ;;; vc-git.el --- VC backend for the git version control system -*- lexical-binding: t -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2006-2012 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2006-2013 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Alexandre Julliard <julliard@winehq.org> | 5 | ;; Author: Alexandre Julliard <julliard@winehq.org> |
| 6 | ;; Keywords: vc tools | 6 | ;; Keywords: vc tools |
diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el index a240fdeb658..5c8201e51cc 100644 --- a/lisp/vc/vc-hg.el +++ b/lisp/vc/vc-hg.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; vc-hg.el --- VC backend for the mercurial version control system -*- lexical-binding: t -*- | 1 | ;;; vc-hg.el --- VC backend for the mercurial version control system -*- lexical-binding: t -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2006-2012 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2006-2013 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Ivan Kanis | 5 | ;; Author: Ivan Kanis |
| 6 | ;; Maintainer: FSF | 6 | ;; Maintainer: FSF |
diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el index a5eb2932af8..5a2b47bb34f 100644 --- a/lisp/vc/vc-hooks.el +++ b/lisp/vc/vc-hooks.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; vc-hooks.el --- resident support for version-control | 1 | ;;; vc-hooks.el --- resident support for version-control |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1992-1996, 1998-2013 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: FSF (see vc.el for full credits) | 5 | ;; Author: FSF (see vc.el for full credits) |
| 6 | ;; Maintainer: Andre Spiegel <spiegel@gnu.org> | 6 | ;; Maintainer: Andre Spiegel <spiegel@gnu.org> |
diff --git a/lisp/vc/vc-mtn.el b/lisp/vc/vc-mtn.el index 8429b2b213d..f2569e2145d 100644 --- a/lisp/vc/vc-mtn.el +++ b/lisp/vc/vc-mtn.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; vc-mtn.el --- VC backend for Monotone -*- lexical-binding: t -*- | 1 | ;;; vc-mtn.el --- VC backend for Monotone -*- lexical-binding: t -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2007-2012 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2007-2013 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> | 5 | ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> |
| 6 | ;; Keywords: vc | 6 | ;; Keywords: vc |
diff --git a/lisp/vc/vc-rcs.el b/lisp/vc/vc-rcs.el index baaf0c3a926..40d8acb7e07 100644 --- a/lisp/vc/vc-rcs.el +++ b/lisp/vc/vc-rcs.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; vc-rcs.el --- support for RCS version-control | 1 | ;;; vc-rcs.el --- support for RCS version-control |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1992-2012 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1992-2013 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: FSF (see vc.el for full credits) | 5 | ;; Author: FSF (see vc.el for full credits) |
| 6 | ;; Maintainer: Andre Spiegel <spiegel@gnu.org> | 6 | ;; Maintainer: Andre Spiegel <spiegel@gnu.org> |
diff --git a/lisp/vc/vc-sccs.el b/lisp/vc/vc-sccs.el index c4f6fd10bdb..bfbe42222e9 100644 --- a/lisp/vc/vc-sccs.el +++ b/lisp/vc/vc-sccs.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; vc-sccs.el --- support for SCCS version-control | 1 | ;;; vc-sccs.el --- support for SCCS version-control |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1992-2012 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1992-2013 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: FSF (see vc.el for full credits) | 5 | ;; Author: FSF (see vc.el for full credits) |
| 6 | ;; Maintainer: Andre Spiegel <spiegel@gnu.org> | 6 | ;; Maintainer: Andre Spiegel <spiegel@gnu.org> |
diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el index 370cd0a9dca..b79af07a756 100644 --- a/lisp/vc/vc-svn.el +++ b/lisp/vc/vc-svn.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; vc-svn.el --- non-resident support for Subversion version-control | 1 | ;;; vc-svn.el --- non-resident support for Subversion version-control |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2003-2012 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2003-2013 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: FSF (see vc.el for full credits) | 5 | ;; Author: FSF (see vc.el for full credits) |
| 6 | ;; Maintainer: Stefan Monnier <monnier@gnu.org> | 6 | ;; Maintainer: Stefan Monnier <monnier@gnu.org> |
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index d001df87d5c..fe259806267 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; vc.el --- drive a version-control system from within Emacs -*- lexical-binding: t -*- | 1 | ;;; vc.el --- drive a version-control system from within Emacs -*- lexical-binding: t -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1992-1998, 2000-2012 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1992-1998, 2000-2013 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: FSF (see below for full credits) | 5 | ;; Author: FSF (see below for full credits) |
| 6 | ;; Maintainer: Andre Spiegel <spiegel@gnu.org> | 6 | ;; Maintainer: Andre Spiegel <spiegel@gnu.org> |