aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2014-12-05 21:36:47 +0100
committerMichael Albinus2014-12-05 21:36:47 +0100
commit7d043d590d4fa7d702a7a12d437e90ec3b4fb069 (patch)
tree1d74de669840ecac4a601258f9ea08f599ae311f
parent4fda400e58339cdf962b5679bf05ebe62c6189c5 (diff)
downloademacs-7d043d590d4fa7d702a7a12d437e90ec3b4fb069.tar.gz
emacs-7d043d590d4fa7d702a7a12d437e90ec3b4fb069.zip
Fix minor bugs in vc.
* vc/vc-mtn.el (vc-mtn-root): * vc/vc-svn.el (vc-svn-registered): Make FILE absolute.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/vc/vc-mtn.el3
-rw-r--r--lisp/vc/vc-svn.el1
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 @@
12014-12-05 Michael Albinus <michael.albinus@gmx.de>
2
3 * vc/vc-mtn.el (vc-mtn-root):
4 * vc/vc-svn.el (vc-svn-registered): Make FILE absolute.
5
12014-12-05 Stefan Monnier <monnier@iro.umontreal.ca> 62014-12-05 Stefan Monnier <monnier@iro.umontreal.ca>
2 7
3 * progmodes/sh-script.el (sh-smie-sh-rules): Go back to the beginning 8 * progmodes/sh-script.el (sh-smie-sh-rules): Go back to the beginning
@@ -5,7 +10,6 @@
5 Generalize this treatment to opening keywords like "while" (bug#18031). 10 Generalize this treatment to opening keywords like "while" (bug#18031).
6 11
72014-12-05 Stefan Monnier <monnier@iro.umontreal.ca> 122014-12-05 Stefan Monnier <monnier@iro.umontreal.ca>
82014-12-05 Stefan Monnier <monnier@iro.umontreal.ca>
9 13
10 * simple.el (newline): Place the hook buffer-locally, 14 * simple.el (newline): Place the hook buffer-locally,
11 to make sure it's first. 15 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."
79(defun vc-mtn-checkout-model (_files) 'implicit) 79(defun vc-mtn-checkout-model (_files) 'implicit)
80 80
81(defun vc-mtn-root (file) 81(defun vc-mtn-root (file)
82 (setq file (if (file-directory-p file) 82 (setq file (expand-file-name file)
83 file (if (file-directory-p file)
83 (file-name-as-directory file) 84 (file-name-as-directory file)
84 (file-name-directory file))) 85 (file-name-directory file)))
85 (or (vc-file-getprop file 'vc-mtn-root) 86 (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."
135 135
136(defun vc-svn-registered (file) 136(defun vc-svn-registered (file)
137 "Check if FILE is SVN registered." 137 "Check if FILE is SVN registered."
138 (setq file (expand-file-name file))
138 (when (vc-svn-root file) 139 (when (vc-svn-root file)
139 (with-temp-buffer 140 (with-temp-buffer
140 (cd (file-name-directory file)) 141 (cd (file-name-directory file))