summaryrefslogtreecommitdiff
path: root/lisp/vc
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/vc')
-rw-r--r--lisp/vc/add-log.el12
-rw-r--r--lisp/vc/ediff-diff.el1
-rw-r--r--lisp/vc/ediff-help.el1
-rw-r--r--lisp/vc/ediff-hook.el1
-rw-r--r--lisp/vc/ediff-init.el1
-rw-r--r--lisp/vc/ediff-merg.el1
-rw-r--r--lisp/vc/ediff-mult.el1
-rw-r--r--lisp/vc/ediff-ptch.el1
-rw-r--r--lisp/vc/ediff-util.el1
-rw-r--r--lisp/vc/ediff-vers.el1
-rw-r--r--lisp/vc/ediff-wind.el1
-rw-r--r--lisp/vc/ediff.el1
-rw-r--r--lisp/vc/pcvs-defs.el1
-rw-r--r--lisp/vc/pcvs-info.el1
-rw-r--r--lisp/vc/pcvs-parse.el1
-rw-r--r--lisp/vc/pcvs-util.el1
-rw-r--r--lisp/vc/vc-annotate.el1
-rw-r--r--lisp/vc/vc-arch.el1
-rw-r--r--lisp/vc/vc-bzr.el3
-rw-r--r--lisp/vc/vc-cvs.el1
-rw-r--r--lisp/vc/vc-dav.el1
-rw-r--r--lisp/vc/vc-dir.el1
-rw-r--r--lisp/vc/vc-dispatcher.el1
-rw-r--r--lisp/vc/vc-git.el1
-rw-r--r--lisp/vc/vc-hg.el1
-rw-r--r--lisp/vc/vc-hooks.el1
-rw-r--r--lisp/vc/vc-mtn.el1
-rw-r--r--lisp/vc/vc-rcs.el1
-rw-r--r--lisp/vc/vc-sccs.el1
-rw-r--r--lisp/vc/vc-svn.el1
30 files changed, 41 insertions, 2 deletions
diff --git a/lisp/vc/add-log.el b/lisp/vc/add-log.el
index cf391b2f9ac..23f1e33f181 100644
--- a/lisp/vc/add-log.el
+++ b/lisp/vc/add-log.el
@@ -755,7 +755,17 @@ Optional arg BUFFER-FILE overrides `buffer-file-name'."
(if add-log-file-name-function
(funcall add-log-file-name-function buffer-file)
(setq buffer-file
- (file-relative-name buffer-file (file-name-directory log-file)))
+ (let* ((dir (file-name-directory log-file))
+ (rel (file-relative-name buffer-file dir)))
+ ;; Sometimes with symlinks, the two buffers may have names that
+ ;; appear to belong to different directory trees. So check the
+ ;; file-truenames, to see if we get a better result.
+ (if (not (string-match "\\`\\.\\./" rel))
+ rel
+ (let ((new (file-relative-name (file-truename buffer-file)
+ (file-truename dir))))
+ (if (< (length new) (length rel))
+ new rel)))))
;; If we have a backup file, it's presumably because we're
;; comparing old and new versions (e.g. for deleted
;; functions) and we'll want to use the original name.
diff --git a/lisp/vc/ediff-diff.el b/lisp/vc/ediff-diff.el
index 5695b058d27..4316b6e4d93 100644
--- a/lisp/vc/ediff-diff.el
+++ b/lisp/vc/ediff-diff.el
@@ -4,6 +4,7 @@
;; 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
+;; Package: ediff
;; This file is part of GNU Emacs.
diff --git a/lisp/vc/ediff-help.el b/lisp/vc/ediff-help.el
index d9ca687e6b0..06a600f0af4 100644
--- a/lisp/vc/ediff-help.el
+++ b/lisp/vc/ediff-help.el
@@ -4,6 +4,7 @@
;; 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
+;; Package: ediff
;; This file is part of GNU Emacs.
diff --git a/lisp/vc/ediff-hook.el b/lisp/vc/ediff-hook.el
index 390538ed009..e917d29a7b4 100644
--- a/lisp/vc/ediff-hook.el
+++ b/lisp/vc/ediff-hook.el
@@ -4,6 +4,7 @@
;; 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
+;; Package: ediff
;; This file is part of GNU Emacs.
diff --git a/lisp/vc/ediff-init.el b/lisp/vc/ediff-init.el
index 0ea1e8c02f6..d1b40f7ee58 100644
--- a/lisp/vc/ediff-init.el
+++ b/lisp/vc/ediff-init.el
@@ -4,6 +4,7 @@
;; 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
+;; Package: ediff
;; This file is part of GNU Emacs.
diff --git a/lisp/vc/ediff-merg.el b/lisp/vc/ediff-merg.el
index c4b94a02e0c..4c6aee15d1d 100644
--- a/lisp/vc/ediff-merg.el
+++ b/lisp/vc/ediff-merg.el
@@ -4,6 +4,7 @@
;; 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
+;; Package: ediff
;; This file is part of GNU Emacs.
diff --git a/lisp/vc/ediff-mult.el b/lisp/vc/ediff-mult.el
index a2c1043049d..39bd06fbd97 100644
--- a/lisp/vc/ediff-mult.el
+++ b/lisp/vc/ediff-mult.el
@@ -4,6 +4,7 @@
;; 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
+;; Package: ediff
;; This file is part of GNU Emacs.
diff --git a/lisp/vc/ediff-ptch.el b/lisp/vc/ediff-ptch.el
index 1203747fdb7..b6c7f6ab7ba 100644
--- a/lisp/vc/ediff-ptch.el
+++ b/lisp/vc/ediff-ptch.el
@@ -4,6 +4,7 @@
;; 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
+;; Package: ediff
;; This file is part of GNU Emacs.
diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el
index 77284a19f50..e1589e3deb4 100644
--- a/lisp/vc/ediff-util.el
+++ b/lisp/vc/ediff-util.el
@@ -4,6 +4,7 @@
;; 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
+;; Package: ediff
;; This file is part of GNU Emacs.
diff --git a/lisp/vc/ediff-vers.el b/lisp/vc/ediff-vers.el
index e314afc24b5..581aad3e4dc 100644
--- a/lisp/vc/ediff-vers.el
+++ b/lisp/vc/ediff-vers.el
@@ -4,6 +4,7 @@
;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
+;; Package: ediff
;; This file is part of GNU Emacs.
diff --git a/lisp/vc/ediff-wind.el b/lisp/vc/ediff-wind.el
index 61213c039c0..8b16c5a4a12 100644
--- a/lisp/vc/ediff-wind.el
+++ b/lisp/vc/ediff-wind.el
@@ -4,6 +4,7 @@
;; 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
+;; Package: ediff
;; This file is part of GNU Emacs.
diff --git a/lisp/vc/ediff.el b/lisp/vc/ediff.el
index cb0d6444b79..c41a6e4a1af 100644
--- a/lisp/vc/ediff.el
+++ b/lisp/vc/ediff.el
@@ -6,6 +6,7 @@
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
;; Created: February 2, 1994
;; Keywords: comparing, merging, patching, vc, tools, unix
+;; Version: 2.81.4
;; 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/pcvs-defs.el b/lisp/vc/pcvs-defs.el
index a49cd2f1ab1..7dda4533f6e 100644
--- a/lisp/vc/pcvs-defs.el
+++ b/lisp/vc/pcvs-defs.el
@@ -6,6 +6,7 @@
;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
;; Keywords: pcl-cvs
+;; Package: pcvs
;; This file is part of GNU Emacs.
diff --git a/lisp/vc/pcvs-info.el b/lisp/vc/pcvs-info.el
index 198b3dd057d..1ae924ff177 100644
--- a/lisp/vc/pcvs-info.el
+++ b/lisp/vc/pcvs-info.el
@@ -6,6 +6,7 @@
;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
;; Keywords: pcl-cvs
+;; Package: pcvs
;; This file is part of GNU Emacs.
diff --git a/lisp/vc/pcvs-parse.el b/lisp/vc/pcvs-parse.el
index deb11936c86..560a270a731 100644
--- a/lisp/vc/pcvs-parse.el
+++ b/lisp/vc/pcvs-parse.el
@@ -5,6 +5,7 @@
;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
;; Keywords: pcl-cvs
+;; Package: pcvs
;; This file is part of GNU Emacs.
diff --git a/lisp/vc/pcvs-util.el b/lisp/vc/pcvs-util.el
index 26f4a829a5f..595b762b2fa 100644
--- a/lisp/vc/pcvs-util.el
+++ b/lisp/vc/pcvs-util.el
@@ -5,6 +5,7 @@
;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
;; Keywords: pcl-cvs
+;; Package: pcvs
;; This file is part of GNU Emacs.
diff --git a/lisp/vc/vc-annotate.el b/lisp/vc/vc-annotate.el
index c95fe54d04a..10b88e6f14c 100644
--- a/lisp/vc/vc-annotate.el
+++ b/lisp/vc/vc-annotate.el
@@ -6,6 +6,7 @@
;; Author: Martin Lorentzson <emwson@emw.ericsson.se>
;; Maintainer: FSF
;; Keywords: vc tools
+;; Package: vc
;; This file is part of GNU Emacs.
diff --git a/lisp/vc/vc-arch.el b/lisp/vc/vc-arch.el
index a723f98b8ae..3ca9d59e3c1 100644
--- a/lisp/vc/vc-arch.el
+++ b/lisp/vc/vc-arch.el
@@ -5,6 +5,7 @@
;; Author: FSF (see vc.el for full credits)
;; Maintainer: Stefan Monnier <monnier@gnu.org>
+;; Package: vc
;; This file is part of GNU Emacs.
diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el
index bea856b28e2..78441772bd4 100644
--- a/lisp/vc/vc-bzr.el
+++ b/lisp/vc/vc-bzr.el
@@ -6,8 +6,9 @@
;; Riccardo Murri <riccardo.murri@gmail.com>
;; Keywords: vc tools
;; Created: Sept 2006
-;; Version: 2008-01-04 (Bzr revno 25)
+;; Version: 2008-01-04
;; URL: http://launchpad.net/vc-bzr
+;; Package: vc
;; This file is part of GNU Emacs.
diff --git a/lisp/vc/vc-cvs.el b/lisp/vc/vc-cvs.el
index 8f9d07723d8..ad307d3a201 100644
--- a/lisp/vc/vc-cvs.el
+++ b/lisp/vc/vc-cvs.el
@@ -5,6 +5,7 @@
;; Author: FSF (see vc.el for full credits)
;; Maintainer: Andre Spiegel <spiegel@gnu.org>
+;; Package: vc
;; This file is part of GNU Emacs.
diff --git a/lisp/vc/vc-dav.el b/lisp/vc/vc-dav.el
index 1036f34fe79..bd495eaf4b7 100644
--- a/lisp/vc/vc-dav.el
+++ b/lisp/vc/vc-dav.el
@@ -5,6 +5,7 @@
;; Author: Bill Perry <wmperry@gnu.org>
;; Maintainer: Bill Perry <wmperry@gnu.org>
;; Keywords: url, vc
+;; Package: vc
;; GNU Emacs is free software: you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
diff --git a/lisp/vc/vc-dir.el b/lisp/vc/vc-dir.el
index 9cacef2f71b..4397251959d 100644
--- a/lisp/vc/vc-dir.el
+++ b/lisp/vc/vc-dir.el
@@ -5,6 +5,7 @@
;; Author: Dan Nicolaescu <dann@ics.uci.edu>
;; Keywords: vc tools
+;; Package: vc
;; This file is part of GNU Emacs.
diff --git a/lisp/vc/vc-dispatcher.el b/lisp/vc/vc-dispatcher.el
index 0b7851f0a85..b6ccae1af1b 100644
--- a/lisp/vc/vc-dispatcher.el
+++ b/lisp/vc/vc-dispatcher.el
@@ -6,6 +6,7 @@
;; Author: FSF (see below for full credits)
;; Maintainer: Eric S. Raymond <esr@thyrsus.com>
;; Keywords: vc tools
+;; Package: vc
;; This file is part of GNU Emacs.
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index cccccbdfd02..48a86454f74 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -4,6 +4,7 @@
;; Author: Alexandre Julliard <julliard@winehq.org>
;; Keywords: vc tools
+;; Package: vc
;; This file is part of GNU Emacs.
diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el
index 8504309e334..c087a4d9e1f 100644
--- a/lisp/vc/vc-hg.el
+++ b/lisp/vc/vc-hg.el
@@ -4,6 +4,7 @@
;; Author: Ivan Kanis
;; Keywords: vc tools
+;; Package: vc
;; This file is part of GNU Emacs.
diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el
index cf444d204ea..91e9b8e3cd3 100644
--- a/lisp/vc/vc-hooks.el
+++ b/lisp/vc/vc-hooks.el
@@ -6,6 +6,7 @@
;; Author: FSF (see vc.el for full credits)
;; Maintainer: Andre Spiegel <spiegel@gnu.org>
+;; Package: vc
;; This file is part of GNU Emacs.
diff --git a/lisp/vc/vc-mtn.el b/lisp/vc/vc-mtn.el
index 03b651d9450..cb03853f865 100644
--- a/lisp/vc/vc-mtn.el
+++ b/lisp/vc/vc-mtn.el
@@ -4,6 +4,7 @@
;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
;; Keywords: vc
+;; Package: vc
;; This file is part of GNU Emacs.
diff --git a/lisp/vc/vc-rcs.el b/lisp/vc/vc-rcs.el
index 9756ec21967..1c3b4c00e32 100644
--- a/lisp/vc/vc-rcs.el
+++ b/lisp/vc/vc-rcs.el
@@ -6,6 +6,7 @@
;; Author: FSF (see vc.el for full credits)
;; Maintainer: Andre Spiegel <spiegel@gnu.org>
+;; Package: vc
;; This file is part of GNU Emacs.
diff --git a/lisp/vc/vc-sccs.el b/lisp/vc/vc-sccs.el
index de476ded369..cf7d97e483d 100644
--- a/lisp/vc/vc-sccs.el
+++ b/lisp/vc/vc-sccs.el
@@ -6,6 +6,7 @@
;; Author: FSF (see vc.el for full credits)
;; Maintainer: Andre Spiegel <spiegel@gnu.org>
+;; Package: vc
;; This file is part of GNU Emacs.
diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el
index 889a60c278e..3af6842ab44 100644
--- a/lisp/vc/vc-svn.el
+++ b/lisp/vc/vc-svn.el
@@ -5,6 +5,7 @@
;; Author: FSF (see vc.el for full credits)
;; Maintainer: Stefan Monnier <monnier@gnu.org>
+;; Package: vc
;; This file is part of GNU Emacs.
View Lorry Controller Status