aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiles Bader2008-01-22 23:59:24 +0000
committerMiles Bader2008-01-22 23:59:24 +0000
commitdfbe40f2145a3df3b4296aaefa3456bb46d19a3b (patch)
tree229147bc7eadc75eaf5e5ebaf52020465779feb9
parent1bad168e59601c1c843a38b2962e77b29f497f11 (diff)
downloademacs-dfbe40f2145a3df3b4296aaefa3456bb46d19a3b.tar.gz
emacs-dfbe40f2145a3df3b4296aaefa3456bb46d19a3b.zip
Fix dates for ChangeLog merge entries
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1007
-rw-r--r--lisp/ChangeLog28
-rw-r--r--src/ChangeLog6
2 files changed, 17 insertions, 17 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 46d26d1a652..6261d014487 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,15 +1,15 @@
12008-01-19 Dan Nicolaescu <dann@ics.uci.edu> 12008-01-23 Dan Nicolaescu <dann@ics.uci.edu>
2 2
3 * progmodes/sh-script.el (sh-basic-offset): 3 * progmodes/sh-script.el (sh-basic-offset):
4 * progmodes/cc-vars.el (c-syntactic-indentation) 4 * progmodes/cc-vars.el (c-syntactic-indentation)
5 (c-syntactic-indentation-in-macros): Mark as safe. 5 (c-syntactic-indentation-in-macros): Mark as safe.
6 6
72008-01-18 Richard Stallman <rms@gnu.org> 72008-01-23 Richard Stallman <rms@gnu.org>
8 8
9 * icomplete.el (icomplete-get-keys): 9 * icomplete.el (icomplete-get-keys):
10 Look up KEYS using all maps in proper buffer. 10 Look up KEYS using all maps in proper buffer.
11 11
122008-01-17 Vinicius Jose Latorre <viniciusjl@ig.com.br> 122008-01-23 Vinicius Jose Latorre <viniciusjl@ig.com.br>
13 Miles Bader <miles@gnu.org> 13 Miles Bader <miles@gnu.org>
14 14
15 * blank-mode.el: New file. Minor mode to visualise TAB, 15 * blank-mode.el: New file. Minor mode to visualise TAB,
@@ -17,13 +17,13 @@
17 code for handling display table (via visws.el package), his code was 17 code for handling display table (via visws.el package), his code was
18 modified, but the main idea was kept. 18 modified, but the main idea was kept.
19 19
202008-01-16 Alan Mackenzie <acm@muc.de> 202008-01-23 Alan Mackenzie <acm@muc.de>
21 21
22 * progmodes/cc-vars.el (c-constant-symbol): Put this defun inside 22 * progmodes/cc-vars.el (c-constant-symbol): Put this defun inside
23 an eval-and-compile, so as to permit byte-compiling (e.g. in 23 an eval-and-compile, so as to permit byte-compiling (e.g. in
24 bootstrap). 24 bootstrap).
25 25
262008-01-16 Juanma Barranquero <lekktu@gmail.com> 262008-01-23 Juanma Barranquero <lekktu@gmail.com>
27 27
28 * frame.el (display-mm-height, display-mm-width): 28 * frame.el (display-mm-height, display-mm-width):
29 * whitespace.el (whitespace-check-leading-whitespace) 29 * whitespace.el (whitespace-check-leading-whitespace)
@@ -33,14 +33,14 @@
33 (whitespace-check-ateol-whitespace): 33 (whitespace-check-ateol-whitespace):
34 * progmodes/ada-xref.el (ada-convert-file-name): Fix typo in docstring. 34 * progmodes/ada-xref.el (ada-convert-file-name): Fix typo in docstring.
35 35
362008-01-15 Dan Nicolaescu <dann@ics.uci.edu> 362008-01-23 Dan Nicolaescu <dann@ics.uci.edu>
37 37
38 * vc-arch.el (vc-arch-delete-rej-if-obsolete): Remove the 38 * vc-arch.el (vc-arch-delete-rej-if-obsolete): Remove the
39 after-save-hook so that it is not called multiple times. 39 after-save-hook so that it is not called multiple times.
40 40
41 * vc-svn.el (vc-svn-resolve-when-done): Likewise. 41 * vc-svn.el (vc-svn-resolve-when-done): Likewise.
42 42
432008-01-12 Eli Zaretskii <eliz@gnu.org> 432008-01-23 Eli Zaretskii <eliz@gnu.org>
44 44
45 * view.el (view-file-other-window, view-file-other-frame): Don't 45 * view.el (view-file-other-window, view-file-other-frame): Don't
46 kill the buffer if it is modified. Doc fixes. 46 kill the buffer if it is modified. Doc fixes.
@@ -55,16 +55,16 @@
55 current-window-configuration. Fix second argument in the call to 55 current-window-configuration. Fix second argument in the call to
56 view-mode-enter. Doc fix. 56 view-mode-enter. Doc fix.
57 57
582008-01-11 Richard Stallman <rms@gnu.org> 582008-01-23 Richard Stallman <rms@gnu.org>
59 59
60 * subr.el (atomic-change-group): Prevent undo list truncation. 60 * subr.el (atomic-change-group): Prevent undo list truncation.
61 61
622008-01-10 Dan Nicolaescu <dann@ics.uci.edu> 622008-01-23 Dan Nicolaescu <dann@ics.uci.edu>
63 63
64 * files.el (safe-local-eval-forms): Mark 64 * files.el (safe-local-eval-forms): Mark
65 (add-hook 'write-file-hooks 'time-stamp) as safe. 65 (add-hook 'write-file-hooks 'time-stamp) as safe.
66 66
672008-01-10 Nick Roberts <nickrob@snap.net.nz> 672008-01-23 Nick Roberts <nickrob@snap.net.nz>
68 68
69 * comint.el (comint-insert-input): Set point first. 69 * comint.el (comint-insert-input): Set point first.
70 70
@@ -73,7 +73,7 @@
73 (gdb-frame-handler): Use buffer-file-name instead of 73 (gdb-frame-handler): Use buffer-file-name instead of
74 buffer-name in case of duplicate file names. 74 buffer-name in case of duplicate file names.
75 75
762008-01-10 Dan Nicolaescu <dann@ics.uci.edu> 762008-01-23 Dan Nicolaescu <dann@ics.uci.edu>
77 77
78 * progmodes/verilog-mode.el (verilog-mode-map): Don't bind C-M-a, 78 * progmodes/verilog-mode.el (verilog-mode-map): Don't bind C-M-a,
79 C-M-e and C-M-h for emacs, they work by default. 79 C-M-e and C-M-h for emacs, they work by default.
@@ -85,17 +85,17 @@
85 (verilog-mark-defun): Only do something useful for XEmacs, emacs 85 (verilog-mark-defun): Only do something useful for XEmacs, emacs
86 does not need it. 86 does not need it.
87 87
882008-01-09 Wilson Snyder <wsnyder@wsnyder.org> 882008-01-23 Wilson Snyder <wsnyder@wsnyder.org>
89 89
90 * progmodes/verilog-mode.el (verilog-booleanp): New function for 90 * progmodes/verilog-mode.el (verilog-booleanp): New function for
91 backward compatibility. Replace all uses of booleanp with 91 backward compatibility. Replace all uses of booleanp with
92 verilog-booleanp. 92 verilog-booleanp.
93 93
942008-01-09 Dan Nicolaescu <dann@ics.uci.edu> 942008-01-23 Dan Nicolaescu <dann@ics.uci.edu>
95 95
96 * vc-hg.el (vc-hg-diff): Don't pass an empty string. 96 * vc-hg.el (vc-hg-diff): Don't pass an empty string.
97 97
982008-01-09 Wilson Snyder <wsnyder@wsnyder.org> 982008-01-23 Wilson Snyder <wsnyder@wsnyder.org>
99 99
100 * progmodes/verilog-mode.el (top-level): Fix spacing. 100 * progmodes/verilog-mode.el (top-level): Fix spacing.
101 (verilog-mode-version, verilog-mode-release-date): Update version 101 (verilog-mode-version, verilog-mode-release-date): Update version
diff --git a/src/ChangeLog b/src/ChangeLog
index b28fecb971a..09fbe99a8f2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,4 @@
12008-01-21 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> 12008-01-23 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
2 2
3 * macterm.c (x_scroll_bar_create): Initialize bar->redraw_needed_p. 3 * macterm.c (x_scroll_bar_create): Initialize bar->redraw_needed_p.
4 (XTset_vertical_scroll_bar): Redraw scroll bar if bar->redraw_needed_p 4 (XTset_vertical_scroll_bar): Redraw scroll bar if bar->redraw_needed_p
@@ -7,7 +7,7 @@
7 7
8 * macterm.h (struct scroll_bar): New member `redraw_needed_p'. 8 * macterm.h (struct scroll_bar): New member `redraw_needed_p'.
9 9
102008-01-17 Jason Rumney <jasonr@gnu.org> 102008-01-23 Jason Rumney <jasonr@gnu.org>
11 11
12 * xterm.c (handle_one_xevent): Revert to counting chars not bytes. 12 * xterm.c (handle_one_xevent): Revert to counting chars not bytes.
13 13
@@ -16,7 +16,7 @@
16 Improve dbcs lead byte detection. Set event timestamp and modifiers 16 Improve dbcs lead byte detection. Set event timestamp and modifiers
17 earlier. 17 earlier.
18 18
192008-01-11 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> 192008-01-23 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
20 20
21 * mac.c (mac_emacs_pid) [MAC_OSX]: New variable. 21 * mac.c (mac_emacs_pid) [MAC_OSX]: New variable.
22 [MAC_OSX] (init_mac_osx_environment): Initialize it. 22 [MAC_OSX] (init_mac_osx_environment): Initialize it.