Merge from emacs--rel--22

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-966

6 files changed, 44 insertions, 4 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 952f9d7e6e8..be2c5824f51 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,20 @@
+2007-12-24  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * process.c (make_process): Initialize pty_flag to Qnil instead of 0
+        as it is not a bit field on Emacs 22 yet.
+
+        * xdisp.c (phys_cursor_in_rect_p): Check if cursor is in fringe area.
+
+2007-12-22  Eli Zaretskii  <eliz@gnu.org>
+
+        * callint.c (syms_of_callint) <command-history>: Add reference to
+        history-length in the doc string.
+
+2007-12-17  Jason Rumney  <jasonr@gnu.org>
+
+        * w32fns.c (w32_wnd_proc) <WM_KEYDOWN>: Cast char to unsigned
+        before passing as wParam.
+
 2007-12-22  Michael Albinus  <michael.albinus@gmx.de>
 
         * dbusbind.c (xd_retrieve_arg): Handle DBUS_TYPE_BYTE,
diff --git a/src/callint.c b/src/callint.c
index a19c424c899..2ac53105afb 100644
--- a/src/callint.c
+++ b/src/callint.c
@@ -941,7 +941,10 @@ This is what `(interactive \"P\")' returns.  */);
 
   DEFVAR_LISP ("command-history", &Vcommand_history,
                doc: /* List of recent commands that read arguments from terminal.
-Each command is represented as a form to evaluate.  */);
+Each command is represented as a form to evaluate.
+
+Maximum length of the history list is determined by the value
+of `history-length', which see.  */);
   Vcommand_history = Qnil;
 
   DEFVAR_LISP ("command-debug-status", &Vcommand_debug_status,
diff --git a/src/macmenu.c b/src/macmenu.c
index aa0be0bdc2e..616d136465a 100644
--- a/src/macmenu.c
+++ b/src/macmenu.c
@@ -3272,7 +3272,8 @@ fill_menubar (wv, deep_p)
             }
 #endif  /* !TARGET_API_MAC_CARBON */
         }
-      else
+
+      if (!menu)
         {
 #if TARGET_API_MAC_CARBON
           err = CreateNewMenu (id, 0, &menu);
diff --git a/src/process.c b/src/process.c
index 0204388e672..e285ed4bde0 100644
--- a/src/process.c
+++ b/src/process.c
@@ -631,7 +631,7 @@ make_process (name)
   p->tick = 0;
   p->update_tick = 0;
   p->pid = 0;
-  p->pty_flag = 0;
+  p->pty_flag = Qnil;
   p->raw_status_new = 0;
   p->status = Qrun;
   p->mark = Fmake_marker ();
diff --git a/src/w32fns.c b/src/w32fns.c
index 0c5bd1e4cc3..497010e9ad3 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -3130,7 +3130,8 @@ w32_wnd_proc (hwnd, msg, wParam, lParam)
                         {
                           /* Forward asciified character sequence.  */
                           post_character_message
-                            (hwnd, WM_CHAR, key.uChar.AsciiChar, lParam,
+                            (hwnd, WM_CHAR,
+                             (unsigned char) key.uChar.AsciiChar, lParam,
                              w32_get_key_modifiers (wParam, lParam));
                           w32_kbd_patch_key (&key);
                         }
diff --git a/src/xdisp.c b/src/xdisp.c
index 22f51859eff..c352c9355ae 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -23534,6 +23534,24 @@ phys_cursor_in_rect_p (w, r)
 {
   XRectangle cr, result;
   struct glyph *cursor_glyph;
+  struct glyph_row *row;
+
+  if (w->phys_cursor.vpos >= 0
+      && w->phys_cursor.vpos < w->current_matrix->nrows
+      && (row = MATRIX_ROW (w->current_matrix, w->phys_cursor.vpos),
+          row->enabled_p)
+      && row->cursor_in_fringe_p)
+    {
+      /* Cursor is in the fringe.  */
+      cr.x = window_box_right_offset (w,
+                                      (WINDOW_HAS_FRINGES_OUTSIDE_MARGINS (w)
+                                       ? RIGHT_MARGIN_AREA
+                                       : TEXT_AREA));
+      cr.y = row->y;
+      cr.width = WINDOW_RIGHT_FRINGE_WIDTH (w);
+      cr.height = row->height;
+      return x_intersect_rectangles (&cr, r, &result);
+    }
 
   cursor_glyph = get_phys_cursor_glyph (w);
   if (cursor_glyph)