Fix minor bugs in vc.

* vc/vc-mtn.el (vc-mtn-root):
* vc/vc-svn.el (vc-svn-registered): Make FILE absolute.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 79ee9d75906c34609a76e1fe1292bfcc8d346d46..7cbacecd16f44814a35304c6a391acba47d9b0ff 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,10 +1,14 @@
+2014-12-05  Michael Albinus  <michael.albinus@gmx.de>
+
+       * vc/vc-mtn.el (vc-mtn-root):
+       * vc/vc-svn.el (vc-svn-registered): Make FILE absolute.
+
 2014-12-05  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * progmodes/sh-script.el (sh-smie-sh-rules): Go back to the beginning
        of the whole pipe when indenting an opening keyword after a |.
        Generalize this treatment to opening keywords like "while" (bug#18031).
 
-2014-12-05  Stefan Monnier  <monnier@iro.umontreal.ca>
 2014-12-05  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * simple.el (newline): Place the hook buffer-locally,

diff --git a/lisp/vc/vc-mtn.el b/lisp/vc/vc-mtn.el
index f35e87e2e2edbd305c303480977d4ac1ad92204a..57225f5f9efab569029070515c267418da3e2f18 100644 (file)
--- a/lisp/vc/vc-mtn.el
+++ b/lisp/vc/vc-mtn.el
@@ -79,7 +79,8 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
 (defun vc-mtn-checkout-model (_files) 'implicit)
 
 (defun vc-mtn-root (file)
-  (setq file (if (file-directory-p file)
+  (setq file (expand-file-name file)
+       file (if (file-directory-p file)
                  (file-name-as-directory file)
                (file-name-directory file)))
   (or (vc-file-getprop file 'vc-mtn-root)

diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el
index e29dae4d47cdcc59a721a7cfde1c253ab90e2d65..c36e90b9fdf39c5cd520f7561b99ec3a6ea0f262 100644 (file)
--- a/lisp/vc/vc-svn.el
+++ b/lisp/vc/vc-svn.el
@@ -135,6 +135,7 @@ If you want to force an empty list of arguments, use t."
 
 (defun vc-svn-registered (file)
   "Check if FILE is SVN registered."
+  (setq file (expand-file-name file))
   (when (vc-svn-root file)
     (with-temp-buffer
       (cd (file-name-directory file))