Merge from emacs-23 branch

7 files changed, 71 insertions, 73 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 45140762c0c..767780d6938 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,37 @@
+2010-03-31  Bernhard Herzog  <bh@intevation.de>  (tiny change)
+
+        * menu.c (Fx_popup_menu): Use last_event_timestamp (Bug#4930).
+
+2010-03-31  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-31  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.
+
+        * nsfns.m (x_implicitly_set_name): If frame-title-format is t, use
+        filename for the title.
+        (ns_set_doc_edited): Do nothing if the selected window is a
+        minibuffer window.
+
+        * nsterm.h: Add prototypes for ns_set_name_as_filename and
+        ns_set_doc_edited.
+
+        * nsterm.m: Remove unneeded prototype.
+
+2010-03-31  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (SOME_MACHINE_OBJECTS): Ensure dbus stuff is always
+        in the DOC file.  (Bug#5336)
+
+2010-03-31  Chong Yidong  <cyd@stupidchicken.com>
+
+        * xdisp.c (pos_visible_p): Revert 2008-01-25 change (Bug#5730).
+
 2010-03-31  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * window.c (keys_of_window): Remove redundant/overridden bindings.
diff --git a/src/Makefile.in b/src/Makefile.in
index ed44cd7700f..2305f6f6533 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -515,7 +515,7 @@ obj=    dispnew.o frame.o scroll.o xdisp.o menu.o $(XMENU_OBJ) window.o \
    in case they are needed there.  */
 SOME_MACHINE_OBJECTS = dosfns.o msdos.o \
   xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o \
-  fontset.o \
+  fontset.o dbusbind.o \
   nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o \
   w32.o w32console.o w32fns.o w32heap.o w32inevt.o \
   w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o $(FONT_DRIVERS)
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 357222bb18a..9de7681b2f7 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -81,6 +81,7 @@ extern Lisp_Object Qunderline, Qundefined;
 extern Lisp_Object Qheight, Qminibuffer, Qname, Qonly, Qwidth;
 extern Lisp_Object Qunsplittable, Qmenu_bar_lines, Qbuffer_predicate, Qtitle;
 extern Lisp_Object Qnone;
+extern Lisp_Object Vframe_title_format;
 
 Lisp_Object Qbuffered;
 Lisp_Object Qfontsize;
@@ -583,6 +584,8 @@ x_implicitly_set_name (FRAME_PTR f, Lisp_Object arg, Lisp_Object oldval)
   NSTRACE (x_implicitly_set_name);
   if (FRAME_ICONIFIED_P (f))
     ns_set_name_iconic (f, arg, 0);
+  else if (FRAME_NS_P (f) && EQ (Vframe_title_format, Qt))
+    ns_set_name_as_filename (f);
   else
     ns_set_name (f, arg, 0);
 }
@@ -627,14 +630,14 @@ ns_set_name_as_filename (struct frame *f)
 
   BLOCK_INPUT;
   pool = [[NSAutoreleasePool alloc] init];
-  name =XBUFFER (buf)->filename;
+  name = XBUFFER (buf)->filename;
   if (NILP (name) || FRAME_ICONIFIED_P (f)) name =XBUFFER (buf)->name;
 
   if (FRAME_ICONIFIED_P (f) && !NILP (f->icon_name))
     name = f->icon_name;
 
   if (NILP (name))
-    name = build_string([ns_app_name UTF8String]);
+    name = build_string ([ns_app_name UTF8String]);
   else
     CHECK_STRING (name);
 
@@ -687,11 +690,14 @@ ns_set_doc_edited (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
 {
   NSView *view = FRAME_NS_VIEW (f);
   NSAutoreleasePool *pool;
-  BLOCK_INPUT;
-  pool = [[NSAutoreleasePool alloc] init];
-  [[view window] setDocumentEdited: !NILP (arg)];
-  [pool release];
-  UNBLOCK_INPUT;
+  if (!MINI_WINDOW_P (XWINDOW (f->selected_window)))
+    {
+      BLOCK_INPUT;
+      pool = [[NSAutoreleasePool alloc] init];
+      [[view window] setDocumentEdited: !NILP (arg)];
+      [pool release];
+      UNBLOCK_INPUT;
+    }
 }
 
 
diff --git a/src/nsterm.h b/src/nsterm.h
index 89ed5ba252f..01086e63b69 100644
--- a/src/nsterm.h
+++ b/src/nsterm.h
@@ -708,6 +708,8 @@ extern void nxatoms_of_nsselect ();
 extern int ns_lisp_to_cursor_type ();
 extern Lisp_Object ns_cursor_type_to_lisp (int arg);
 extern Lisp_Object Qnone;
+extern void ns_set_name_as_filename (struct frame *f);
+extern void ns_set_doc_edited (struct frame *f, Lisp_Object arg);
 
 extern int
 ns_defined_color (struct frame *f, char *name, XColor *color_def, int alloc,
diff --git a/src/nsterm.m b/src/nsterm.m
index a4d06f82d97..7bc82e96104 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -4173,8 +4173,6 @@ ns_term_shutdown (int sig)
   ns_send_appdefined (-2);
 }
 
-extern void update_window_cursor (struct window *w, int on);
-
 - (void)fd_handler: (NSTimer *) fdEntry
 /* --------------------------------------------------------------------------
      Check data waiting on file descriptors and terminate if so
diff --git a/src/xdisp.c b/src/xdisp.c
index c8b4c2b9aa5..b6c69f661ed 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -1377,33 +1377,7 @@ pos_visible_p (w, charpos, x, y, rtop, rbot, rowh, vpos)
         visible_p = 1;
       if (visible_p)
         {
-          if (it_method == GET_FROM_BUFFER)
-            {
-              Lisp_Object window, prop;
-
-              XSETWINDOW (window, w);
-              prop = Fget_char_property (make_number (charpos),
-                                         Qinvisible, window);
-
-              /* If charpos coincides with invisible text covered with an
-                 ellipsis, use the first glyph of the ellipsis to compute
-                 the pixel positions.  */
-              if (TEXT_PROP_MEANS_INVISIBLE (prop) == 2)
-                {
-                  struct glyph_row *row = it.glyph_row;
-                  struct glyph *glyph = row->glyphs[TEXT_AREA];
-                  struct glyph *end = glyph + row->used[TEXT_AREA];
-                  int x = row->x;
-
-                  for (; glyph < end
-                         && (!BUFFERP (glyph->object)
-                             || glyph->charpos < charpos);
-                       glyph++)
-                    x += glyph->pixel_width;
-                  top_x = x;
-                }
-            }
-          else if (it_method == GET_FROM_DISPLAY_VECTOR)
+          if (it_method == GET_FROM_DISPLAY_VECTOR)
             {
               /* We stopped on the last glyph of a display vector.
                  Try and recompute.  Hack alert!  */
@@ -9787,32 +9761,7 @@ x_consider_frame_title (frame)
       if (! STRINGP (f->name)
           || SBYTES (f->name) != len
           || bcmp (title, SDATA (f->name), len) != 0)
-        {
-#ifdef HAVE_NS
-          if (FRAME_NS_P (f))
-            {
-              if (!MINI_WINDOW_P(XWINDOW(f->selected_window)))
-                {
-                  if (EQ (fmt, Qt))
-                    ns_set_name_as_filename (f);
-                  else
-                    x_implicitly_set_name (f, make_string(title, len),
-                                           Qnil);
-                }
-            }
-          else
-#endif
-            x_implicitly_set_name (f, make_string (title, len), Qnil);
-        }
-#ifdef HAVE_NS
-      if (FRAME_NS_P (f))
-        {
-          /* do this also for frames with explicit names */
-          ns_implicitly_set_icon_type(f);
-          ns_set_doc_edited(f, Fbuffer_modified_p
-                            (XWINDOW (f->selected_window)->buffer), Qnil);
-        }
-#endif
+        x_implicitly_set_name (f, make_string (title, len), Qnil);
     }
 }
 
@@ -9909,6 +9858,11 @@ prepare_menu_bars ()
 #ifdef HAVE_WINDOW_SYSTEM
           update_tool_bar (f, 0);
 #endif
+#ifdef HAVE_NS
+          if (windows_or_buffers_changed)
+            ns_set_doc_edited (f, Fbuffer_modified_p
+                               (XWINDOW (f->selected_window)->buffer));
+#endif
           UNGCPRO;
         }
 
@@ -23519,9 +23473,6 @@ display_and_set_cursor (w, on, hpos, vpos, x, y)
 /* Switch the display of W's cursor on or off, according to the value
    of ON.  */
 
-#ifndef HAVE_NS
-static
-#endif
 void
 update_window_cursor (w, on)
      struct window *w;
@@ -24440,7 +24391,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;