aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2013-01-02 11:02:05 -0800
committerGlenn Morris2013-01-02 11:02:05 -0800
commit9539d46584868ff54a5acf1bdbe2446f9a84974a (patch)
treea6e570d69454c89e92729ad456159acedc4c2d7d
parent9ff99d22a01be4cafc27064ad8474672eb2fe09b (diff)
downloademacs-9539d46584868ff54a5acf1bdbe2446f9a84974a.tar.gz
emacs-9539d46584868ff54a5acf1bdbe2446f9a84974a.zip
Correct dates of merged ChangeLog entries
-rw-r--r--doc/lispref/ChangeLog2
-rw-r--r--lisp/ChangeLog14
-rw-r--r--src/ChangeLog2
3 files changed, 8 insertions, 10 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 1820f304425..b837525fb42 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,4 +1,4 @@
12012-12-31 Glenn Morris <rgm@gnu.org> 12013-01-02 Glenn Morris <rgm@gnu.org>
2 2
3 * customize.texi (Common Keywords, Type Keywords): 3 * customize.texi (Common Keywords, Type Keywords):
4 Replace "active field" with "button". (Bug#13310) 4 Replace "active field" with "button". (Bug#13310)
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 00bce0b62b5..9ff1ca01c4a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,10 +1,10 @@
12012-12-31 Andreas Schwab <schwab@linux-m68k.org> 12013-01-02 Andreas Schwab <schwab@linux-m68k.org>
2 2
3 * emacs-lisp/byte-run.el (defmacro): Use same argument parsing as 3 * emacs-lisp/byte-run.el (defmacro): Use same argument parsing as
4 defun. Don't check for DECL if DOCSTRING isn't a string. 4 defun. Don't check for DECL if DOCSTRING isn't a string.
5 (defun): Likewise. 5 (defun): Likewise.
6 6
72012-12-31 Glenn Morris <rgm@gnu.org> 72013-01-02 Glenn Morris <rgm@gnu.org>
8 8
9 * eshell/em-cmpl.el (eshell-pcomplete): 9 * eshell/em-cmpl.el (eshell-pcomplete):
10 More thoroughly imitate pcomplete. (Bug#13293) 10 More thoroughly imitate pcomplete. (Bug#13293)
@@ -12,29 +12,27 @@
12 * files.el (parse-colon-path): Doc fix. (Bug#12351) 12 * files.el (parse-colon-path): Doc fix. (Bug#12351)
13 Return nil for empty path elements. (Bug#13296) 13 Return nil for empty path elements. (Bug#13296)
14 14
152012-12-31 Fabián Ezequiel Gallina <fgallina@cuca> 152013-01-02 Fabián Ezequiel Gallina <fgallina@cuca>
16 16
17 * progmodes/python.el (python-nav-end-of-statement): Rewrite in 17 * progmodes/python.el (python-nav-end-of-statement): Rewrite in
18 order to improve efficiency (Based on Daniel Colascione's 18 order to improve efficiency (Based on Daniel Colascione's
19 <dancol@dancol.org> patch). (Bug#13182) 19 <dancol@dancol.org> patch). (Bug#13182)
20 20
212012-12-31 Glenn Morris <rgm@gnu.org> 212013-01-02 Glenn Morris <rgm@gnu.org>
22 22
23 * vc/log-edit.el (log-edit-header-contents-regexp): Add doc string. 23 * vc/log-edit.el (log-edit-header-contents-regexp): Add doc string.
24 24
252012-12-31 Fabián Ezequiel Gallina <fgallina@cuca> 252013-01-02 Fabián Ezequiel Gallina <fgallina@cuca>
26 26
27 * progmodes/python.el: Support other commands triggering 27 * progmodes/python.el: Support other commands triggering
28 python-indent-line so indentation cycling continues to work. 28 python-indent-line so indentation cycling continues to work.
29 (python-indent-trigger-commands): New defcustom. 29 (python-indent-trigger-commands): New defcustom.
30 (python-indent-line): Use it. 30 (python-indent-line): Use it.
31 31
322012-12-31 Fabián Ezequiel Gallina <fgallina@cuca>
33
34 * progmodes/python.el (python-shell-send-region): Add blank lines 32 * progmodes/python.el (python-shell-send-region): Add blank lines
35 for non sent code so backtraces remain correct. 33 for non sent code so backtraces remain correct.
36 34
372012-12-31 Andreas Schwab <schwab@linux-m68k.org> 352013-01-02 Andreas Schwab <schwab@linux-m68k.org>
38 36
39 * emacs-lisp/byte-run.el (defmacro): Don't lose final nil if 37 * emacs-lisp/byte-run.el (defmacro): Don't lose final nil if
40 neither DOCSTRING nor DECL was given. (Bug#13316) 38 neither DOCSTRING nor DECL was given. (Bug#13316)
diff --git a/src/ChangeLog b/src/ChangeLog
index d967bebff14..7342f7c6add 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,4 @@
12012-12-31 Glenn Morris <rgm@gnu.org> 12013-01-02 Glenn Morris <rgm@gnu.org>
2 2
3 * keymap.c (Fkey_description): Doc fix. (Bug#13323) 3 * keymap.c (Fkey_description): Doc fix. (Bug#13323)
4 4