Replace "Maintainer: FSF" with the emacs-devel mailing address

[bpt/emacs.git] / lisp / version.el

diff --git a/lisp/version.el b/lisp/version.el
index 1a3265b..68b502c 100644 (file)
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1985, 1992, 1994-1995, 1999-2014 Free Software
 ;; Foundation, Inc.
 
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: internal
 ;; Package: emacs
 
@@ -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
@@ -186,9 +186,10 @@ only ask the VCS if we cannot find any information ourselves."
         (with-temp-buffer
           (let ((default-directory (file-name-as-directory dir)))
             (and (eq 0
-                     (ignore-errors
-                       (call-process "git" nil '(t nil) nil "log"
-                                     "-1" "--pretty=format:%N")))
+                     (condition-case nil
+                         (call-process "git" nil '(t nil) nil "log"
+                                       "-1" "--pretty=format:%N")
+                       (error nil)))
                  (not (zerop (buffer-size)))
                  (replace-regexp-in-string "\n" "" (buffer-string))))))))