aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorChong Yidong2010-03-10 10:17:13 -0500
committerChong Yidong2010-03-10 10:17:13 -0500
commit288f9fc069a4a49839556064e89759bb23c658cb (patch)
treefbf0e377587bfcb2cb2d1b014c205fad347f81b3 /lisp
parentd48cd3f48fdd0d67f906311b632fb58ae4765b5e (diff)
downloademacs-288f9fc069a4a49839556064e89759bb23c658cb.tar.gz
emacs-288f9fc069a4a49839556064e89759bb23c658cb.zip
Bump version to 24.0.50.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/erc/ChangeLog4
-rw-r--r--lisp/mh-e/ChangeLog4
-rw-r--r--lisp/org/ChangeLog4
-rw-r--r--lisp/url/ChangeLog4
-rw-r--r--lisp/version.el2
6 files changed, 21 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d5ce272d128..634e9010c46 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12010-03-10 Chong Yidong <cyd@stupidchicken.com>
2
3 * Branch for 23.2.
4
12010-03-10 Stefan Monnier <monnier@iro.umontreal.ca> 52010-03-10 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 * vc-git.el (vc-git-revision-table): Include remote branches. 7 * vc-git.el (vc-git-revision-table): Include remote branches.
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index c192b3400b4..18fc5f188a9 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,7 @@
12010-03-10 Chong Yidong <cyd@stupidchicken.com>
2
3 * Branch for 23.2.
4
12010-02-07 Vivek Dasmohapatra <vivek@etla.org> 52010-02-07 Vivek Dasmohapatra <vivek@etla.org>
2 6
3 * erc-services.el (erc-nickserv-alist): Fix defcustom type (Bug#5520). 7 * erc-services.el (erc-nickserv-alist): Fix defcustom type (Bug#5520).
diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index 83d5e391ffd..4405249d981 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,3 +1,7 @@
12010-03-10 Chong Yidong <cyd@stupidchicken.com>
2
3 * Branch for 23.2.
4
12009-12-01 Bill Wohler <wohler@newt.com> 52009-12-01 Bill Wohler <wohler@newt.com>
2 6
3 * mh-search.el (mh-mairix-execute-search): Use mh vfolder_format. 7 * mh-search.el (mh-mairix-execute-search): Use mh vfolder_format.
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 7ce303b5add..a7602555002 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,7 @@
12010-03-10 Chong Yidong <cyd@stupidchicken.com>
2
3 * Branch for 23.2.
4
12010-02-15 Chong Yidong <cyd@stupidchicken.com> 52010-02-15 Chong Yidong <cyd@stupidchicken.com>
2 6
3 * org-freemind.el (org-freemind-from-org-mode-node) 7 * org-freemind.el (org-freemind-from-org-mode-node)
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 2a8c6ebe25b..ea44ea54b6b 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,7 @@
12010-03-10 Chong Yidong <cyd@stupidchicken.com>
2
3 * Branch for 23.2.
4
12010-01-23 Chong Yidong <cyd@stupidchicken.com> 52010-01-23 Chong Yidong <cyd@stupidchicken.com>
2 6
3 * url-util.el: Require url-vars (Bug#5459). 7 * url-util.el: Require url-vars (Bug#5459).
diff --git a/lisp/version.el b/lisp/version.el
index 905733a56b3..5cd0cc8d634 100644
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -32,7 +32,7 @@
32(defconst emacs-copyright "Copyright (C) 2010 Free Software Foundation, Inc." "\ 32(defconst emacs-copyright "Copyright (C) 2010 Free Software Foundation, Inc." "\
33Short copyright string for this version of Emacs.") 33Short copyright string for this version of Emacs.")
34 34
35(defconst emacs-version "23.1.93" "\ 35(defconst emacs-version "24.0.50" "\
36Version numbers of this version of Emacs.") 36Version numbers of this version of Emacs.")
37 37
38(defconst emacs-major-version (progn (string-match "^[0-9]+" emacs-version) (string-to-number (match-string 0 emacs-version))) "\ 38(defconst emacs-major-version (progn (string-match "^[0-9]+" emacs-version) (string-to-number (match-string 0 emacs-version))) "\