Merge from emacs-23

1 files changed, 31 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index d38f2b2c9e1..61d2f124935 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,34 @@
+2010-04-19  Juanma Barranquero  <lekktu@gmail.com>
+
+        * dired.c (Ffile_attributes): Fix typo in docstring.
+
+2010-04-19  Adrian Robert  <Adrian.B.Robert@gmail.com>
+
+        * nsmenu.m (EmacsDialog-runDialogAt:): Declare ret as
+        NSInteger (Bug#5811).
+
+2010-04-19  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * s/darwin.h (PTY_ITERATION, PTY_NAME_SPRINTF, PTY_TTY_NAME_SPRINTF)
+        (PTY_OPEN): New defines.  Use openpty (Bug#726, Bug#5819).
+
+2010-04-19  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * frame.h (FRAME_LINE_TO_PIXEL_Y): Add missing parenthesis.
+
+2010-04-19  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * frame.h (FRAME_TEXT_LINES_TO_PIXEL_HEIGHT): Don't use
+        FRAME_LINE_TO_PIXEL_Y.
+
+        * xterm.c (x_set_window_size_1): Don't add border_width/height to
+        pixelwidth/height.
+
+2010-04-19  Chong Yidong  <cyd@stupidchicken.com>
+
+        * xdisp.c (prepare_menu_bars): Don't call ns_set_doc_edited for
+        terminal frames (Bug#5837).
+
 2010-04-19  Eli Zaretskii  <eliz@gnu.org>
 
         * .gdbinit (xsubchartable): New command.