aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric S. Raymond2014-01-10 12:13:10 -0500
committerEric S. Raymond2014-01-10 12:13:10 -0500
commit7e03bb327b5dd3a53840a8f1c00e765f3eb3e2f0 (patch)
tree1019a54c705b43c757ce252f16b362f047dd398a
parentdd8067103161d24f61a7d4f9efa195ac9e3543d4 (diff)
downloademacs-7e03bb327b5dd3a53840a8f1c00e765f3eb3e2f0.tar.gz
emacs-7e03bb327b5dd3a53840a8f1c00e765f3eb3e2f0.zip
Restore compatibilty with 23.1 (Tested)
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/emacs-lisp/eieio.el2
-rw-r--r--lisp/version.el3
3 files changed, 9 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 41ea776eba5..2b3c5794b21 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12014-01-10 Eric S. Raymond <esr@thyrsus.com>
2
3 * version.el (emacs-bzr-get-version): Restore compatibilty with
4 23.1 (Tested).
5
12014-01-10 Bozhidar Batsov <bozhidar@batsov.com> 62014-01-10 Bozhidar Batsov <bozhidar@batsov.com>
2 7
3 * progmodes/ruby-mode.el (auto-mode-alist): Add .podspec 8 * progmodes/ruby-mode.el (auto-mode-alist): Add .podspec
diff --git a/lisp/emacs-lisp/eieio.el b/lisp/emacs-lisp/eieio.el
index 681bd376685..38ed8c433f6 100644
--- a/lisp/emacs-lisp/eieio.el
+++ b/lisp/emacs-lisp/eieio.el
@@ -927,7 +927,7 @@ Optional argument GROUP is the sub-group of slots to display.
927 927
928;;;*** 928;;;***
929 929
930;;;### (autoloads nil "eieio-opt" "eieio-opt.el" "c7a7173e78edd280eb4289bd2a0376c5") 930;;;### (autoloads nil "eieio-opt" "eieio-opt.el" "f03278724025221a0259ed48516286f3")
931;;; Generated autoloads from eieio-opt.el 931;;; Generated autoloads from eieio-opt.el
932 932
933(autoload 'eieio-browse "eieio-opt" "\ 933(autoload 'eieio-browse "eieio-opt" "\
diff --git a/lisp/version.el b/lisp/version.el
index 0362b03484c..71e56858afa 100644
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -128,6 +128,9 @@ Returns nil if unable to find this information."
128 "dir")) 128 "dir"))
129 (buffer-string)))) 129 (buffer-string))))
130 130
131(define-obsolete-function-alias 'emacs-bzr-get-version
132 'emacs-repository-get-version "24.4")
133
131(defun emacs-repository-get-version (&optional dir external) 134(defun emacs-repository-get-version (&optional dir external)
132 "Try to return as a string the repository revision of the Emacs sources. 135 "Try to return as a string the repository revision of the Emacs sources.
133The format of the returned string is dependent on the VCS in use. 136The format of the returned string is dependent on the VCS in use.