merge trunk

7 files changed, 83 insertions, 43 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index ceb9cad4d88..be916dff20d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,8 +1,36 @@
+2010-04-05  Chong Yidong  <cyd@stupidchicken.com>
+
+        * xdisp.c (prepare_menu_bars): Don't call ns_set_doc_edited for
+        terminal frames (Bug#5837).
+
+2010-03-31  Chong Yidong  <cyd@stupidchicken.com>
+
+        * nsfns.m (ns_set_doc_edited): Remove unused arg OLDVAL.
+        * nsterm.h: Fix prototype.
+
+2010-03-31  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32fns.c (x_create_tip_frame): Copy `parms' before we modify it
+        in this function.  (Bug#5703)
+
+2010-03-31  Chong Yidong  <cyd@stupidchicken.com>
+
+        * nsterm.h: Fix last change.
+
+2010-03-30  Bernhard Herzog  <bh@intevation.de>  (tiny change)
+
+        * menu.c (Fx_popup_menu): Use last_event_timestamp (Bug#4930).
+
+2010-03-30  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xdisp.c (note_mouse_highlight): Don't do highlight if pointer is
+        invisible (Bug#5766).
+
 2010-03-29  Adrian Robert  <adrian.b.robert@gmail.com>
 
         * xdisp.c (x_consider_frame_title, update_window_cursor): Remove
         HAVE_NS conditionals.
-        (prepare_menu_bars)[HAVE_NS]: Call ns_set_doc_edited.
+        (prepare_menu_bars) [HAVE_NS]: Call ns_set_doc_edited.
 
         * nsfns.m (x_implicitly_set_name): If frame-title-format is t, use
         filename for the title.
@@ -308,7 +336,7 @@
 2010-01-19  Alan Mackenzie  <acm@muc.de>
 
         Fix spurious before-change-functions invocation from (insert ?\n).
-        * textprop.c (set_text_properties): rename parameter
+        * textprop.c (set_text_properties): Rename parameter
         `signal_after_change_p' to `coherent_change_p', and make the
         invocation of `modify_region' conditional on it.
 
@@ -10330,7 +10358,7 @@
 
         * font.c (Vfont_encoding_alist, find_font_encoding): Move from
         fontset.c.
-        (font_pixel_size)[! HAVE_WINDOW_SYSTEM]: Return 1.
+        (font_pixel_size) [! HAVE_WINDOW_SYSTEM]: Return 1.
         (font_open_entity): Update FRAME_X_DISPLAY_INFO (f)->n_fonts,
         FRAME_SMALLEST_CHAR_WIDTH (f), and FRAME_SMALLEST_FONT_HEIGHT (f)
         only when HAVE_WINDOW_SYSTEM is defined.
@@ -20164,7 +20192,7 @@
 
 2007-08-29  ARISAWA Akihiro  <ari@mbf.ocn.ne.jp>  (tiny change)
 
-        * term.c (dissociate_if_controlling_tty)[USG]: Fix parse error.
+        * term.c (dissociate_if_controlling_tty) [USG]: Fix parse error.
 
 2007-08-29  Yoshiaki Kasahara  <kasahara@nc.kyushu-u.ac.jp>  (tiny change)
 
diff --git a/src/ChangeLog.10 b/src/ChangeLog.10
index d4d99a80a18..39b70d9b199 100644
--- a/src/ChangeLog.10
+++ b/src/ChangeLog.10
@@ -2137,7 +2137,7 @@
 
         * Makefile.in (keymap.o): Add "keymap.h" and "window.h" dependencies.
 
-        * keymap.c: include "window.h".
+        * keymap.c: Include "window.h".
         (Fcommand_remapping): New optional POSITION argument.
         (Fkey_binding): New optional POSITION argument.  Completely rework
         handling of mouse clicks to get the same order of keymaps as
@@ -5867,9 +5867,9 @@
 
 2005-12-26  Luc Teirlinck  <teirllm@auburn.edu>
 
-        * keyboard.h: extern last_point_position_window.
+        * keyboard.h: Extern last_point_position_window.
 
-        * undo.c: include keyboard.h.
+        * undo.c: Include keyboard.h.
 
         * Makefile.in (undo.o): Depend on keyboard.h.
 
@@ -8276,7 +8276,7 @@
         * xdisp.c (syms_of_xdisp) <nobreak-char-display>: Doc fix.
         (syms_of_xdisp) <void-text-area-pointer>: Doc fix.
 
-        * fileio.c (Frename_file)[!DOS_NT]: Don't call chown on MSDOS/Windows.
+        * fileio.c (Frename_file) [!DOS_NT]: Don't call chown on MSDOS/Windows.
 
 2005-06-23  Richard M. Stallman  <rms@gnu.org>
 
@@ -12611,7 +12611,7 @@
         * macterm.c (mac_check_for_quit_char): Remove warning for using
         NULL where 0 should be used.
         * unexmacosx.c: Use malloc/malloc.h on Tiger instead of
-        objc/malloc.h
+        objc/malloc.h.
         * mac.c: Include time.h for Tiger compatibility.
 
 2004-10-07  Kim F. Storm  <storm@cua.dk>
@@ -12843,7 +12843,7 @@
         * Makefile.in (msdos.o): Depend on buffer.h, commands.h, and
         blockinput.h.
         (dosfns.o): Depend on blockinput.h, window.h, dispextern.h,
-        charset.h, and coding.h
+        charset.h, and coding.h.
         (w16select.o): Depend on buffer.h, charset.h, coding.h, and composite.h.
         (term.o): Depend on window.h and keymap.h.
         (abbrev.o): Depend on syntax.h.
@@ -17222,7 +17222,7 @@
 2003-09-01  Jason Rumney  <jasonr@gnu.org>
 
         * makefile.w32-in (alloca.o): Remove.
-        (coding.o): Depend on intervals.h
+        (coding.o): Depend on intervals.h.
         (emacs.o, bytecode.o): Depend on window.h.
 
 2003-09-01  Dave Love  <fx@gnu.org>
@@ -22643,7 +22643,7 @@
         (Fx_popup_menu): Don't show pop up menu until preceding one is
         actually cleaned up.  Moved UNGCPRO outside #ifdef HAVE_MENUS block.
 
-        * w32menu.c: Changes adapted from xmenu.c
+        * w32menu.c: Changes adapted from xmenu.c.
         (set_frame_menubar): First parse all submenus,
         then make widget_value trees from them.
         Don't allocate any widget_value objects
@@ -24232,7 +24232,7 @@
         m/ibmps2-aix.h, m/ibmrs6000.h, m/ibmrt-aix.h, m/ibmrt.h,
         m/ibms390.h, m/intel386.h, m/iris4d.h, m/irist.h, m/isi-ov.h,
         m/m68k.h, m/macppc.h, m/masscomp.h, m/mg1.h, m/mips-siemens.h,
-        m/mips.h, m/news-r6.h, m/news.h, m/next.h, m/nh3000.h, m/nh4000.h
+        m/mips.h, m/news-r6.h, m/news.h, m/next.h, m/nh3000.h, m/nh4000.h,
         m/ns32000.h, m/orion.h, m/pfa50.h, m/plexus.h, m/pmax.h,
         m/powerpcle.h, m/pyrmips.h, m/sequent-ptx.h, m/sequent.h,
         m/sparc.h, m/sr2k.h, m/symmetry.h, m/tad68k.h, m/tahoe.h,
diff --git a/src/ChangeLog.8 b/src/ChangeLog.8
index de162cb39bc..6da7b6862a5 100644
--- a/src/ChangeLog.8
+++ b/src/ChangeLog.8
@@ -2886,10 +2886,10 @@
 
         * sysdep.c: Define numerous routines to emulate Unix system calls.
 
-        * xfaces.c: on MacOS, define the set of colors listed in rgb.txt
+        * xfaces.c: On MacOS, define the set of colors listed in rgb.txt
         file of an X Window environment.
 
-        * xfaces.c: on MacOS, define the Lisp functions x-display-color-p,
+        * xfaces.c: On MacOS, define the Lisp functions x-display-color-p,
         x-display-grayscale, x-color-defined-p, and x-color-values.
 
         * sysdep.c [macintosh] (stat, fstat, mkdir, rmdir, utime, access)
@@ -3160,7 +3160,7 @@
 
 1999-08-25  Alexandre Oliva  <oliva@dcc.unicamp.br>
 
-        * unexelf.c: Merge IRIX debugging info patch from unexsgi.c
+        * unexelf.c: Merge IRIX debugging info patch from unexsgi.c.
         * m/iris4d.h: Use unexelf for IRIX 5.*.
         * m/iris5d.h: Use unexelf for IRIX 6.*.
         * unexsgi.c: Deleted.
@@ -3767,8 +3767,8 @@
 1999-08-06  Gerd Moellmann  <gerd@gnu.org>
 
         * xdisp.c (compute_line_metrics): If first line's physical ascent
-         is larger than its logical ascent, use the physical ascent, and
-         make the row taller.  Set row's overlapping_p flag.
+        is larger than its logical ascent, use the physical ascent, and
+        make the row taller.  Set row's overlapping_p flag.
 
         * dispnew.c (redraw_overlapping_rows): Use flag overlapping_p.
         (direct_output_for_insert): Ditto.
@@ -4675,7 +4675,7 @@
 
 1999-06-04  Gerd Moellmann  <gerd@gnu.org>
 
-        * xfaces.c (recompute_basic_faces)[GLYPH_DEBUG]: Check return
+        * xfaces.c (recompute_basic_faces) [GLYPH_DEBUG]: Check return
         value of realize_basic_faces.
         (load_face_font_or_fontset): Store full font name in face.
         (realize_default_face): Use full font name.
@@ -5601,9 +5601,9 @@
         * window.c (coordinates_in_window): Use CURRENT_MODE_LINE_HEIGHT.
 
         * xdisp.c (redisplay_window): If mode line height has changed,
-         arrange for a thorough immediate redisplay using the correct mode
-         line height.
-         (window_box_height): Use CURRENT_MODE_LINE_HEIGHT.
+        arrange for a thorough immediate redisplay using the correct mode
+        line height.
+        (window_box_height): Use CURRENT_MODE_LINE_HEIGHT.
 
         * dispextern.h (MATRIX_MODE_LINE_HEIGHT): New.
         (CURRENT_MODE_LINE_HEIGHT): New.
@@ -7062,7 +7062,7 @@
 1998-05-04  Gerd Moellmann  <gerd@gnu.org>
 
         * Makefile.in (LIBXPM): If not already defined, define to -lXpm.
-        (LIBX)[HAVE_X11]: Add LIBXPM.
+        (LIBX) [HAVE_X11]: Add LIBXPM.
 
         * xfns.c (xpm_image_p): Implementation of image type functions
         for XPM.
@@ -10052,7 +10052,7 @@
 
         * xterm.h (WINDOW_COL_PIXEL_X etc.) Removed.
 
-        * dispextern.h (WINDOW_TO_FRAME_HPOS/VPOS): Moved to dispnew.c
+        * dispextern.h (WINDOW_TO_FRAME_HPOS/VPOS): Moved to dispnew.c.
 
         * xfns.c (x_contour_region): Use pixel coordinates from window
         cursor instead of WINDOW_TO_FRAME_H/VPOS.
@@ -10897,7 +10897,7 @@
         (MATRIX_ROW_INVERSE_P): Former MATRIX_ROW_HIGHLIGHT_P.
         (struct glyph_row): HIGHLIGHT_P -> INVERSE_P
 
-        * all files: use above new names.
+        * all files: Use above new names.
 
         * dispnew.c (scroll_frame_lines): Simplified.  Use
         SCROLL_GLYPH_MATRIX.
@@ -10961,7 +10961,7 @@
         (init_display): Ditto.
         (syms_of_display): Ditto.
 
-        * dispextern.h: add prototypes for REDRAW_FRAME,
+        * dispextern.h: Add prototypes for REDRAW_FRAME,
         REDRAW_GARBAGED_FRAMES, CANCEL_LINE, CLEAR_FRAME_RECORDS,
         INIT_DESIRED_GLYPHS, SCROLL_FRAME_LINES, PRESERVE_OTHER_COLUMNS,
         ADJUST_WINDOW_CHARSTARTS, CANCEL_MY_COLUMNS,
@@ -11108,9 +11108,9 @@
         (make_window): Initialize DESIRED_MATRIX and CURRENT_MATRIX.
         (replace_window): Reset DESIRED_MATRIX and CURRENT_MATRIX
 
-        * Makefile.in (window.o): Add dependency window.c -> dispextern.h
+        * Makefile.in (window.o): Add dependency window.c -> dispextern.h.
 
-        * window.c: Include dispextern.h
+        * window.c: Include dispextern.h.
 
         * scroll.c (do_scrolling): Use new glyphs.
         (do_direct_scrolling): Ditto.
@@ -11141,9 +11141,9 @@
         (write_glyphs): Ditto.
         (insert_glyphs): Ditto.
 
-        * Makefile.in (term.o): term.c depends on dispextern.h
+        * Makefile.in (term.o): term.c depends on dispextern.h.
 
-        * term.c: Include dispextern.h
+        * term.c: Include dispextern.h.
 
         * dispnew.c (direct_output_forward_char): Old glyph functions
         removed, new inserted.
@@ -11560,8 +11560,8 @@
 1999-05-02  Andrew Innes  <andrewi@gnu.org>
 
         * s/ms-w32.h (HAVE_FSYNC): New macro.
-         (fsync): Map to _commit.
-         (ftruncate): Map to _chsize.
+        (fsync): Map to _commit.
+        (ftruncate): Map to _chsize.
 
         * w32term.c (dumpglyphs): On Windows NT, do output in Unicode even
         for ASCII, if enabled, to avoid memory allocation overhead for
@@ -11666,7 +11666,7 @@
 
         * fontset.c (Fquery_fontset): Don't check for fontset aliases here.
         (Fnew_fontset, Fset_fontset_font): Check for them here.
-         (Ffontset_info, Fnew_fontset, Fset_fontset_font):
+        (Ffontset_info, Fnew_fontset, Fset_fontset_font):
         Fix error message syntax.
 
         * buffer.c (Fmake_indirect_buffer): Copy multibyte status
@@ -12775,7 +12775,7 @@
 1998-12-06  Eli Zaretskii  <eliz@mescaline.gnu.org>
 
         * Makefile.in (msdos.o): Depend on termchar.h, charset.h,
-        coding.h, and disptab.h
+        coding.h, and disptab.h.
 
         * msdos.c (Vdos_unsupported_char_glyph): New variable.
         (syms_of_msdos): DEFVAR_LISP it.
diff --git a/src/menu.c b/src/menu.c
index ad6054d7192..bfe54a53328 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -61,6 +61,10 @@ extern HMENU current_popup_menu;
 #define HAVE_BOXES 1
 #endif
 
+/* The timestamp of the last input event Emacs received from the X server.  */
+/* Defined in keyboard.c.  */
+extern unsigned long last_event_timestamp;
+
 extern Lisp_Object QCtoggle, QCradio;
 
 Lisp_Object menu_items;
@@ -1073,7 +1077,6 @@ no quit occurs and `x-popup-menu' returns nil.  */)
   int keymaps = 0;
   int for_click = 0;
   int specpdl_count = SPECPDL_INDEX ();
-  Lisp_Object timestamp = Qnil;
   struct gcpro gcpro1;
 
   if (NILP (position))
@@ -1107,10 +1110,9 @@ no quit occurs and `x-popup-menu' returns nil.  */)
             for_click = 1;
             tem = Fcar (Fcdr (position));  /* EVENT_START (position) */
             window = Fcar (tem);             /* POSN_WINDOW (tem) */
-            tem = Fcdr (Fcdr (tem));
-            x = Fcar (Fcar (tem));
-            y = Fcdr (Fcar (tem));
-            timestamp = Fcar (Fcdr (tem));
+            tem = Fcar (Fcdr (Fcdr (tem))); /* POSN_WINDOW_POSN (tem) */
+            x = Fcar (tem);
+            y = Fcdr (tem);
           }
 
         /* If a click happens in an external tool bar or a detached
@@ -1318,9 +1320,13 @@ no quit occurs and `x-popup-menu' returns nil.  */)
   selection = ns_menu_show (f, xpos, ypos, for_click,
                             keymaps, title, &error_name);
 #else /* MSDOS and X11 */
+  /* Assume last_event_timestamp is the timestamp of the button event.
+     Is this assumption ever violated?  We can't use the timestamp
+     stored within POSITION because there the top bits from the actual
+     timestamp may be truncated away (Bug#4930).  */
   selection = xmenu_show (f, xpos, ypos, for_click,
                           keymaps, title, &error_name,
-                          INTEGERP (timestamp) ? XUINT (timestamp) : 0);
+                          last_event_timestamp);
 #endif
 
   UNBLOCK_INPUT;
diff --git a/src/nsfns.m b/src/nsfns.m
index 9de7681b2f7..7e7fd48caf0 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -686,7 +686,7 @@ ns_set_name_as_filename (struct frame *f)
 
 
 void
-ns_set_doc_edited (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
+ns_set_doc_edited (struct frame *f, Lisp_Object arg)
 {
   NSView *view = FRAME_NS_VIEW (f);
   NSAutoreleasePool *pool;
diff --git a/src/w32fns.c b/src/w32fns.c
index 938bd463b25..795e7208569 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -5427,6 +5427,10 @@ x_create_tip_frame (dpyinfo, parms, text)
 
   kb = dpyinfo->terminal->kboard;
 
+  /* The calls to x_get_arg remove elements from PARMS, so copy it to
+     avoid destructive changes behind our caller's back.  */
+  parms = Fcopy_alist (parms);
+
   /* Get the name of the frame to use for resource lookup.  */
   name = x_get_arg (dpyinfo, parms, Qname, "name", "Name", RES_TYPE_STRING);
   if (!STRINGP (name)
diff --git a/src/xdisp.c b/src/xdisp.c
index 81b97b25c1c..734b60bc1dd 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -9570,7 +9570,8 @@ prepare_menu_bars ()
           update_tool_bar (f, 0);
 #endif
 #ifdef HAVE_NS
-          if (windows_or_buffers_changed)
+          if (windows_or_buffers_changed
+              && FRAME_NS_P (f))
             ns_set_doc_edited (f, Fbuffer_modified_p
                                (XWINDOW (f->selected_window)->buffer));
 #endif
@@ -23551,7 +23552,8 @@ note_mouse_highlight (f, x, y)
 #endif
 
   if (NILP (Vmouse_highlight)
-      || !f->glyphs_initialized_p)
+      || !f->glyphs_initialized_p
+      || f->pointer_invisible)
     return;
 
   dpyinfo->mouse_face_mouse_x = x;