aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiles Bader2008-03-10 00:50:06 +0000
committerMiles Bader2008-03-10 00:50:06 +0000
commit390b81fa98fa581afe965a2943d81d7dd07f0dc5 (patch)
treed94c97a15f57a2a900115d37a04eedd6e6d1dcc7
parent56388398e7a1251497f002072c061002ec9d9e81 (diff)
downloademacs-390b81fa98fa581afe965a2943d81d7dd07f0dc5.tar.gz
emacs-390b81fa98fa581afe965a2943d81d7dd07f0dc5.zip
Fix merged ChangeLog dates
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1096
-rw-r--r--lisp/ChangeLog12
-rw-r--r--src/ChangeLog6
2 files changed, 9 insertions, 9 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d13d048c98e..6c1fb545e24 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,21 +1,21 @@
12008-03-06 Kim F. Storm <storm@cua.dk> 12008-03-10 Kim F. Storm <storm@cua.dk>
2 2
3 * help.el (view-emacs-todo, describe-gnu-project): Define obsolete 3 * help.el (view-emacs-todo, describe-gnu-project): Define obsolete
4 function aliases for the old names. 4 function aliases for the old names.
5 5
62008-03-05 Juanma Barranquero <lekktu@gmail.com> 62008-03-10 Juanma Barranquero <lekktu@gmail.com>
7 7
8 * iswitchb.el (iswitchb-use-faces): Doc fix. 8 * iswitchb.el (iswitchb-use-faces): Doc fix.
9 (iswitchb-buffer-ignore, iswitchb-read-buffer): Fix typos in 9 (iswitchb-buffer-ignore, iswitchb-read-buffer): Fix typos in
10 docstrings. 10 docstrings.
11 11
122008-03-03 Dan Nicolaescu <dann@ics.uci.edu> 122008-03-10 Dan Nicolaescu <dann@ics.uci.edu>
13 13
14 * progmodes/verilog-mode.el (verilog-highlight-grouping-keywords): 14 * progmodes/verilog-mode.el (verilog-highlight-grouping-keywords):
15 Fix typo. 15 Fix typo.
16 (verilog-type-font-keywords): Reindent. 16 (verilog-type-font-keywords): Reindent.
17 17
182008-03-03 Michael McNamara <mac@mail.brushroad.com> 182008-03-10 Michael McNamara <mac@mail.brushroad.com>
19 19
20 * verilog-mode.el (verilog-font-grouping-keywords): Fix bug in the 20 * verilog-mode.el (verilog-font-grouping-keywords): Fix bug in the
21 grouping-keyword regular expression. 21 grouping-keyword regular expression.
@@ -24,13 +24,13 @@
24 (verilog-highlight-grouping-keywords): The toggle for special 24 (verilog-highlight-grouping-keywords): The toggle for special
25 highlighting of grouping keywords. 25 highlighting of grouping keywords.
26 26
272008-03-02 Juri Linkov <juri@jurta.org> 272008-03-10 Juri Linkov <juri@jurta.org>
28 28
29 * startup.el: Revert 2008-02-28 change that adds initial message 29 * startup.el: Revert 2008-02-28 change that adds initial message
30 to *scratch* buffer regardless of the value of 30 to *scratch* buffer regardless of the value of
31 `inhibit-startup-screen'. 31 `inhibit-startup-screen'.
32 32
332008-03-01 Dan Nicolaescu <dann@ics.uci.edu> 332008-03-10 Dan Nicolaescu <dann@ics.uci.edu>
34 34
35 * textmodes/css-mode.el (css-indent-offset, css-electric-keys): 35 * textmodes/css-mode.el (css-indent-offset, css-electric-keys):
36 * textmodes/bibtex-style.el (bibtex-style-indent-basic): 36 * textmodes/bibtex-style.el (bibtex-style-indent-basic):
diff --git a/src/ChangeLog b/src/ChangeLog
index 0678ed7488e..bce37ce9148 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,13 +1,13 @@
12008-03-07 Stefan Monnier <monnier@iro.umontreal.ca> 12008-03-10 Stefan Monnier <monnier@iro.umontreal.ca>
2 2
3 * fileio.c (Fsubstitute_in_file_name): Fix up computation of maximum 3 * fileio.c (Fsubstitute_in_file_name): Fix up computation of maximum
4 size of resulting string. 4 size of resulting string.
5 5
62008-03-05 Jason Rumney <jasonr@gnu.org> 62008-03-10 Jason Rumney <jasonr@gnu.org>
7 7
8 * dispnew.c (adjust_glyph_matrix): Initialize window_height. 8 * dispnew.c (adjust_glyph_matrix): Initialize window_height.
9 9
102008-03-03 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> 102008-03-10 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
11 11
12 * xdisp.c (handle_single_display_spec): Undo 2007-10-16 changes. 12 * xdisp.c (handle_single_display_spec): Undo 2007-10-16 changes.
13 Don't pretend as if characters with display property haven't been 13 Don't pretend as if characters with display property haven't been