aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2014-01-22 13:29:40 -0500
committerGlenn Morris2014-01-22 13:29:40 -0500
commitedace89f2670ed235d98c6d33f32d49228f423e3 (patch)
tree1988b1c14ffb1b9c91e399443ea0a949cbc91765
parent983664c0b46b7b4f93e11dcbb0ebed7d000d2430 (diff)
downloademacs-edace89f2670ed235d98c6d33f32d49228f423e3.tar.gz
emacs-edace89f2670ed235d98c6d33f32d49228f423e3.zip
* lisp/version.el (emacs-bzr-version-bzr): Fix typo.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/version.el4
2 files changed, 4 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 622da8cf3e8..8731930cbba 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12014-01-22 Glenn Morris <rgm@gnu.org> 12014-01-22 Glenn Morris <rgm@gnu.org>
2 2
3 * version.el (emacs-bzr-version-bzr): Fix typo.
4
3 * version.el (emacs-repository-get-version): 5 * version.el (emacs-repository-get-version):
4 Check either .bzr or .git, but not both. 6 Check either .bzr or .git, but not both.
5 Make the git case actually use the DIR argument, and return nil 7 Make the git case actually use the DIR argument, and return nil
diff --git a/lisp/version.el b/lisp/version.el
index 1a3265b55b2..4f5bb67585a 100644
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -106,7 +106,7 @@ Returns nil if unable to find this information."
106 (looking-at "[0-9]+\0\\([^\0\n]+\\)\0") 106 (looking-at "[0-9]+\0\\([^\0\n]+\\)\0")
107 (match-string 1)))))) 107 (match-string 1))))))
108 108
109(defun emacs-bzr-version-bzr (_dir) 109(defun emacs-bzr-version-bzr (dir)
110 "Ask bzr itself for the version information for directory DIR." 110 "Ask bzr itself for the version information for directory DIR."
111 ;; Comments on `bzr version-info': 111 ;; Comments on `bzr version-info':
112 ;; i) Unknown files also cause clean != 1. 112 ;; i) Unknown files also cause clean != 1.
@@ -125,7 +125,7 @@ Returns nil if unable to find this information."
125 (call-process "bzr" nil '(t nil) nil "version-info" 125 (call-process "bzr" nil '(t nil) nil "version-info"
126 "--custom" 126 "--custom"
127 "--template={revno} {revision_id} (clean = {clean})" 127 "--template={revno} {revision_id} (clean = {clean})"
128 "dir")) 128 dir))
129 (buffer-string)))) 129 (buffer-string))))
130 130
131(define-obsolete-function-alias 'emacs-bzr-get-version 131(define-obsolete-function-alias 'emacs-bzr-get-version