From edace89f2670ed235d98c6d33f32d49228f423e3 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 22 Jan 2014 13:29:40 -0500 Subject: [PATCH] * lisp/version.el (emacs-bzr-version-bzr): Fix typo. --- lisp/ChangeLog | 2 ++ lisp/version.el | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 622da8cf3e..8731930cbb 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2014-01-22 Glenn Morris + * version.el (emacs-bzr-version-bzr): Fix typo. + * version.el (emacs-repository-get-version): Check either .bzr or .git, but not both. Make the git case actually use the DIR argument, and return nil diff --git a/lisp/version.el b/lisp/version.el index 1a3265b55b..4f5bb67585 100644 --- a/lisp/version.el +++ b/lisp/version.el @@ -106,7 +106,7 @@ Returns nil if unable to find this information." (looking-at "[0-9]+\0\\([^\0\n]+\\)\0") (match-string 1)))))) -(defun emacs-bzr-version-bzr (_dir) +(defun emacs-bzr-version-bzr (dir) "Ask bzr itself for the version information for directory DIR." ;; Comments on `bzr version-info': ;; i) Unknown files also cause clean != 1. @@ -125,7 +125,7 @@ Returns nil if unable to find this information." (call-process "bzr" nil '(t nil) nil "version-info" "--custom" "--template={revno} {revision_id} (clean = {clean})" - "dir")) + dir)) (buffer-string)))) (define-obsolete-function-alias 'emacs-bzr-get-version -- 2.20.1