summaryrefslogtreecommitdiff
path: root/src/ChangeLog
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2011-02-12 19:16:28 -0500
committerChong Yidong <cyd@stupidchicken.com>2011-02-12 19:16:28 -0500
commite730aabed55f3b65020672f1d58afc55fda4eef2 (patch)
treedb931d6586b8ce49b8428fcc45c83825b2c60252 /src/ChangeLog
parentd0ba09dcd877f4e8b6b7643c69d596ac88b545bc (diff)
parent84eb0351d8be4811897c8cf62a69757ff5d14001 (diff)
Merge changes from emacs-23 branch
Diffstat (limited to 'src/ChangeLog')
-rw-r--r--src/ChangeLog21
1 files changed, 19 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 4469297e32f..c677288ad3e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,20 @@
+2011-02-12 Martin Rudalics <rudalics@gmx.at>
+
+ * window.c (select_window): Check inhibit_point_swap argument when
+ deciding whether to return immediately.
+
+2011-02-12 Jan Djärv <jan.h.d@swipnet.se>
+
+ * nsterm.m (setFrame, initFrame): Make sure pixel_height doesn't become
+ zero (Bug#7348).
+
+2011-02-12 Chong Yidong <cyd@stupidchicken.com>
+
+ * config.in (TERMINFO): New definition.
+
+ * s/netbsd.h: Use it to choose between terminfo and termcap
+ (Bug#7642).
+
2011-02-12 Paul Eggert <eggert@cs.ucla.edu>
* md5.c (md5_process_bytes): Use sizeof, not __alignof__.
@@ -1610,7 +1627,7 @@
* gtkutil.c (menubar_map_cb): New function (Bug#7425).
(xg_update_frame_menubar): Connect signal map to menubar_map_cb.
- Use 23 as menubar height if 0. (Bug#7425).
+ Use 23 as menubar height if 0. (Bug#7425).
2010-11-26 Eli Zaretskii <eliz@gnu.org>
@@ -2617,7 +2634,7 @@
is more portable.
* keyboard.c (gobble_input): Move call of xd_read_queued_messages ...
- (kbd_buffer_get_event): ... here. This is needed for cygwin, which
+ (kbd_buffer_get_event): ... here. This is needed for cygwin, which
has not defined SIGIO.
2010-10-08 Chong Yidong <cyd@stupidchicken.com>