aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJuanma Barranquero2012-01-10 18:32:19 +0100
committerJuanma Barranquero2012-01-10 18:32:19 +0100
commitcd394be17755d8248ba01ea7ba8502a31f1ce71a (patch)
tree8bd7a8df9cf11edddb567add9f757c328e29236a /src
parent96f8741e07a33e6ba81d5afadf3e277e8a54911c (diff)
downloademacs-cd394be17755d8248ba01ea7ba8502a31f1ce71a.tar.gz
emacs-cd394be17755d8248ba01ea7ba8502a31f1ce71a.zip
ChangeLog fixes.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog8
-rw-r--r--src/ChangeLog.115
2 files changed, 6 insertions, 7 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index e80f335bfc7..83e703e80a1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -118,7 +118,7 @@
118 (trackingNotification): Surround with ifdef NS_IMPL_COCOA. 118 (trackingNotification): Surround with ifdef NS_IMPL_COCOA.
119 (syms_of_nsmenu): Set trackingMenu to 1 if not NS_IMPL_COCOA. 119 (syms_of_nsmenu): Set trackingMenu to 1 if not NS_IMPL_COCOA.
120 120
1212011-12-18 David Reitter <reitter@cmu.edu> 1212011-12-18 David Reitter <reitter@cmu.edu>
122 122
123 * nsterm.m (ns_term_init): Subscribe for notifications 123 * nsterm.m (ns_term_init): Subscribe for notifications
124 NSMenuDidBeginTrackingNotification and NSMenuDidEndTrackingNotification 124 NSMenuDidBeginTrackingNotification and NSMenuDidEndTrackingNotification
@@ -5767,7 +5767,7 @@
5767 where the include path doesn't have X11/X.h by default. See 5767 where the include path doesn't have X11/X.h by default. See
5768 <http://lists.gnu.org/archive/html/emacs-devel/2011-05/msg00561.html>. 5768 <http://lists.gnu.org/archive/html/emacs-devel/2011-05/msg00561.html>.
5769 5769
57702011-05-20 Kenichi Handa <handa@m17n.org> 57702011-05-20 Kenichi Handa <handa@m17n.org>
5771 5771
5772 * composite.c (find_automatic_composition): Fix previous change. 5772 * composite.c (find_automatic_composition): Fix previous change.
5773 5773
@@ -6109,7 +6109,7 @@
6109 * lread.c (lisp_file_lexically_bound_p): Stop scanning at end 6109 * lread.c (lisp_file_lexically_bound_p): Stop scanning at end
6110 marker. (Bug#8610) 6110 marker. (Bug#8610)
6111 6111
61122011-05-05 Eli Zaretskii <eliz@gnu.org> 61122011-05-05 Eli Zaretskii <eliz@gnu.org>
6113 6113
6114 * w32heap.c (allocate_heap) [USE_LISP_UNION_TYPE || USE_LSB_TAG]: 6114 * w32heap.c (allocate_heap) [USE_LISP_UNION_TYPE || USE_LSB_TAG]:
6115 New version that can reserve upto 2GB of heap space. 6115 New version that can reserve upto 2GB of heap space.
@@ -8313,7 +8313,7 @@
8313 are now in src/globals.h. 8313 are now in src/globals.h.
8314 (syms_of_minibuf): Remove spurious & from previous change. 8314 (syms_of_minibuf): Remove spurious & from previous change.
8315 8315
83162011-03-20 Leo <sdl.web@gmail.com> 83162011-03-20 Leo Liu <sdl.web@gmail.com>
8317 8317
8318 * minibuf.c (completing-read-function): New variable. 8318 * minibuf.c (completing-read-function): New variable.
8319 (completing-read-default): Rename from completing-read. 8319 (completing-read-default): Rename from completing-read.
diff --git a/src/ChangeLog.11 b/src/ChangeLog.11
index 6c361399535..e8bfd964312 100644
--- a/src/ChangeLog.11
+++ b/src/ChangeLog.11
@@ -3538,7 +3538,6 @@
3538 * nsmenu.m (syms_of_nsmenu): 3538 * nsmenu.m (syms_of_nsmenu):
3539 * nsfns.m (syms_of_nsfns): 3539 * nsfns.m (syms_of_nsfns):
3540 * msdos.c (syms_of_msdos): 3540 * msdos.c (syms_of_msdos):
3541
3542 * image.c (syms_of_image): 3541 * image.c (syms_of_image):
3543 * charset.c (syms_of_charset): Use intern_c_string instead of intern. 3542 * charset.c (syms_of_charset): Use intern_c_string instead of intern.
3544 3543
@@ -4388,7 +4387,7 @@
4388 * xml.c (Fxml_parse_string, Fxml_parse_string): Revert last change. 4387 * xml.c (Fxml_parse_string, Fxml_parse_string): Revert last change.
4389 Don't make first argument optional. Doc fix. 4388 Don't make first argument optional. Doc fix.
4390 4389
43912010-09-14 Leo <sdl.web@gmail.com> (tiny change) 43902010-09-14 Leo Liu <sdl.web@gmail.com> (tiny change)
4392 4391
4393 * xml.c (Fxml_parse_string, Fhtml_parse_string): Fix up the 4392 * xml.c (Fxml_parse_string, Fhtml_parse_string): Fix up the
4394 parameters for the doc string. 4393 parameters for the doc string.
@@ -29523,7 +29522,7 @@
29523 (Fdisplay_buffer): Use it. 29522 (Fdisplay_buffer): Use it.
29524 (syms_of_window): Export, and initialize it. 29523 (syms_of_window): Export, and initialize it.
29525 29524
295262007-09-06 Pixel <pixel@mandriva.com> (tiny change) 295252007-09-06 Pascal Rigaux <pixel@mandriva.com> (tiny change)
29527 29526
29528 * image.c (gif_load): Fix bug: Handle nonexistent colormap. 29527 * image.c (gif_load): Fix bug: Handle nonexistent colormap.
29529 29528