Merge from emacs-23

5 files changed, 54 insertions, 5 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.
diff --git a/src/dired.c b/src/dired.c
index 2240f6ec76e..a3ea23df2f6 100644
--- a/src/dired.c
+++ b/src/dired.c
@@ -935,9 +935,9 @@ DEFUN ("file-attributes", Ffile_attributes, Sfile_attributes, 1, 2, 0,
 Value is nil if specified file cannot be opened.
 
 ID-FORMAT specifies the preferred format of attributes uid and gid (see
-below) - valid values are 'string and 'integer. The latter is the default,
-but we plan to change that, so you should specify a non-nil value for
-ID-FORMAT if you use the returned uid or gid.
+below) - valid values are 'string and 'integer.  The latter is the
+default, but we plan to change that, so you should specify a non-nil value
+for ID-FORMAT if you use the returned uid or gid.
 
 Elements of the attribute list are:
  0. t for directory, string (name linked to) for symbolic link, or nil.
diff --git a/src/frame.h b/src/frame.h
index 36b0b6b069c..887d47eff21 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -980,7 +980,7 @@ extern Lisp_Object selected_frame;
    at ROW/COL.  */
 
 #define FRAME_LINE_TO_PIXEL_Y(f, row) \
-  ((row < FRAME_TOP_MARGIN (f) ? 0 : FRAME_INTERNAL_BORDER_WIDTH (f))   \
+  (((row) < FRAME_TOP_MARGIN (f) ? 0 : FRAME_INTERNAL_BORDER_WIDTH (f)) \
    + (row) * FRAME_LINE_HEIGHT (f))
 
 #define FRAME_COL_TO_PIXEL_X(f, col) \
diff --git a/src/nsmenu.m b/src/nsmenu.m
index 2581be9aeb7..f85ebc165af 100644
--- a/src/nsmenu.m
+++ b/src/nsmenu.m
@@ -1709,7 +1709,7 @@ void process_dialog (id window, Lisp_Object list)
 
 - (Lisp_Object)runDialogAt: (NSPoint)p
 {
-  int ret;
+  NSInteger ret;
   extern EMACS_TIME timer_check (int do_it_now); /* TODO: add to a header */
 
   /* initiate a session that will be ended by pop_down_menu */
diff --git a/src/s/darwin.h b/src/s/darwin.h
index e8081c6dd25..016ed343f06 100644
--- a/src/s/darwin.h
+++ b/src/s/darwin.h
@@ -90,6 +90,24 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
  */
 
 #define HAVE_PTYS
+/* Run only once.  We need a `for'-loop because the code uses
+   `continue'.  */
+#define PTY_ITERATION   for (i = 0; i < 1; i++)
+#define PTY_NAME_SPRINTF        /* none */
+#define PTY_TTY_NAME_SPRINTF    /* none */
+/* Note that openpty may fork via grantpt on Mac OS X 10.4/Darwin 8.
+   But we don't have to block SIGCHLD because it is blocked in the
+   implementation of grantpt.  */
+#define PTY_OPEN                                                \
+  do                                                            \
+    {                                                           \
+      int slave;                                                \
+      if (openpty (&fd, &slave, pty_name, NULL, NULL) == -1)    \
+        fd = -1;                                                \
+      else                                                      \
+        emacs_close (slave);                                    \
+    }                                                           \
+  while (0)
 
 /**
  * PTYs only work correctly on Darwin 7 or higher.  So make the