aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlrich Müller2015-01-17 23:19:15 +0100
committerUlrich Müller2015-01-17 23:19:15 +0100
commitfd5c0bcc3b5e72e6a6b1f91b3257ef9d9d042fd4 (patch)
treed834e10516c097962c1ebf254c53118eafce0f40
parent0aaa5d699bf95afb152317f0788b8e2d2042f59d (diff)
downloademacs-fd5c0bcc3b5e72e6a6b1f91b3257ef9d9d042fd4.tar.gz
emacs-fd5c0bcc3b5e72e6a6b1f91b3257ef9d9d042fd4.zip
Update docstring of emacs-repository-get-version.
* version.el (emacs-repository-get-version): Update docstring.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/version.el6
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 @@
12015-01-17 Ulrich Müller <ulm@gentoo.org>
2
3 * version.el (emacs-repository-get-version): Update docstring.
4
12015-01-17 Ivan Shmakov <ivan@siamics.net> 52015-01-17 Ivan Shmakov <ivan@siamics.net>
2 6
3 * url/url-cookie.el (url-cookie-write-file): Let-bind print-length 7 * 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
105correspond to the running Emacs. 105correspond to the running Emacs.
106 106
107Optional argument DIR is a directory to use instead of 107Optional argument DIR is a directory to use instead of
108`source-directory'. Optional argument EXTERNAL non-nil means to 108`source-directory'. Optional argument EXTERNAL is ignored and is
109maybe ask the VCS itself, if the sources appear to be under 109retained for compatibility."
110version control. If `force', always ask. the VCS. Otherwise
111only ask the VCS if we cannot find any information ourselves."
112 (or dir (setq dir source-directory)) 110 (or dir (setq dir source-directory))
113 (cond ((file-directory-p (expand-file-name ".git" dir)) 111 (cond ((file-directory-p (expand-file-name ".git" dir))
114 (message "Waiting for git...") 112 (message "Waiting for git...")