diff options
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/vc/vc-mtn.el | 3 | ||||
| -rw-r--r-- | lisp/vc/vc-svn.el | 1 |
3 files changed, 8 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 79ee9d75906..7cbacecd16f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +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 @@ -5,7 +10,6 @@ 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, to make sure it's first. diff --git a/lisp/vc/vc-mtn.el b/lisp/vc/vc-mtn.el index f35e87e2e2e..57225f5f9ef 100644 --- 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 e29dae4d47c..c36e90b9fdf 100644 --- 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)) |