[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r115930: Create a needed obsolete-variable alias. Fi
From: |
Eric S. Raymond |
Subject: |
[Emacs-diffs] trunk r115930: Create a needed obsolete-variable alias. Fix up some docstrings. |
Date: |
Thu, 09 Jan 2014 01:33:43 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 115930
revision-id: address@hidden
parent: address@hidden
committer: Eric S. Raymond <address@hidden>
branch nick: trunk
timestamp: Wed 2014-01-08 20:32:45 -0500
message:
Create a needed obsolete-variable alias. Fix up some docstrings.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/version.el version.el-20091113204419-o5vbwnq5f7feedwu-1613
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-01-08 22:57:47 +0000
+++ b/lisp/ChangeLog 2014-01-09 01:32:45 +0000
@@ -4,7 +4,7 @@
Bazaar-specific names.
* version.el (emacs-bzr-version): Name changed to
- emacs-repository-version.
+ emacs-repository-version. Obsolete-variable alias made.
* loadup.el: Follow through on this name change.
* lisp/mail/emacsbug.el (report-emacs-bug): Factor out any
assumption about the version control system in use.
=== modified file 'lisp/version.el'
--- a/lisp/version.el 2014-01-08 22:57:47 +0000
+++ b/lisp/version.el 2014-01-09 01:32:45 +0000
@@ -86,10 +86,12 @@
;; Set during dumping, this is a defvar so that it can be setq'd.
(defvar emacs-repository-version nil
- "String giving the bzr revision from which this Emacs was built.
-The format is: [revno] revision_id, where revno may be absent.
-Value is nil if Emacs was not built from a bzr checkout, or if we could
-not determine the revision.")
+ "String giving the repository revision from which this Emacs was built.
+Value is nil if Emacs was not built from a repository checkout,
+or if we could not determine the revision.")
+
+(define-obsolete-variable-alias 'emacs-bzr-version
+ 'emacs-repository-version "24.4")
(defun emacs-bzr-version-dirstate (dir)
"Try to return as a string the bzr revision ID of directory DIR.
@@ -127,16 +129,18 @@
(buffer-string))))
(defun emacs-repository-get-version (&optional dir external)
- "Try to return as a string the bzr revision of the Emacs sources.
-The format is: [revno] revision_id, where revno may be absent.
-Value is nil if the sources do not seem to be under bzr, or if we could
-not determine the revision. Note that this reports on the current state
-of the sources, which may not correspond to the running Emacs.
+ "Try to return as a string the repository revision of the Emacs sources.
+The format of the returned string is dependent on the VCS in use.
+Value is nil if the sources do not seem to be under version
+control, or if we could not determine the revision. Note that
+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 `bzr' itself,
-if the sources appear to be under bzr. If `force', always ask bzr.
-Otherwise only ask bzr if we cannot find any information ourselves."
+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."
(or dir (setq dir source-directory))
(when (file-directory-p (expand-file-name ".bzr/branch" dir))
(if (eq external 'force)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r115930: Create a needed obsolete-variable alias. Fix up some docstrings.,
Eric S. Raymond <=