diff options
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/version.el | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index bf5f60db13e..cce686b5f1d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2015-01-17 Ulrich Müller <ulm@gentoo.org> + + * version.el (emacs-repository-get-version): Update docstring. + 2015-01-17 Ivan Shmakov <ivan@siamics.net> * url/url-cookie.el (url-cookie-write-file): Let-bind print-length diff --git a/lisp/version.el b/lisp/version.el index 43778739ba6..1837cbf0a85 100644 --- a/lisp/version.el +++ b/lisp/version.el @@ -105,10 +105,8 @@ this reports on the current state of the sources, which may not correspond to the running Emacs. Optional argument DIR is a directory to use instead of -`source-directory'. Optional argument EXTERNAL non-nil means to -maybe ask the VCS itself, if the sources appear to be under -version control. If `force', always ask. the VCS. Otherwise -only ask the VCS if we cannot find any information ourselves." +`source-directory'. Optional argument EXTERNAL is ignored and is +retained for compatibility." (or dir (setq dir source-directory)) (cond ((file-directory-p (expand-file-name ".git" dir)) (message "Waiting for git...") |