Merge from mainline.

6 files changed, 68 insertions, 30 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index cf5a8c0ee1e..38eb460359c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,34 @@
+2013-06-12  Xue Fuqiao  <xfq.free@gmail.com>
+
+        * fileio.c (expand_file_name): Doc fix.
+
+2013-06-11  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Tickle glib by waiting for Emacs itself, not for process 0 (Bug#14569).
+        * process.c (init_process_emacs) [HAVE_GLIB && !WINDOWSNT]:
+        Wait for self, not for 0.  This can't hurt on GNU or similar
+        system, and may help with Cygwin.
+
+        * keyboard.c: Don't use PROP (...) as an lvalue.
+        (parse_tool_bar_item) [!USE_GTK && !HAVE_NS]:
+        Use set_prop (A, B), not PROP (A) = B.
+
+2013-06-10  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (get_it_property): Use it->window instead of generating
+        a Lisp object from it->w.
+
+2013-06-09  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (get_it_property): If it->object is a buffer, pass to
+        get-char-property the window that is being rendered, instead of
+        the buffer, to support window-specific overlays.  (Bug#14575)
+        (compute_display_string_pos): When W is NULL, use the current
+        buffer as the object to pass to get-char-property.
+        (Fcurrent_bidi_paragraph_direction): Assign NULL to the window
+        pointer member of the bidi iterator, since no window is pertinent
+        to this function.
+
 2013-06-08  Eli Zaretskii  <eliz@gnu.org>
 
         * bidi.c (bidi_fetch_char): Accept additional argument, the window
@@ -8,8 +39,8 @@
         * xdisp.c (init_from_display_pos, init_iterator)
         (handle_single_display_spec, next_overlay_string)
         (get_overlay_strings_1, reseat_1, reseat_to_string)
-        (push_prefix_prop, Fcurrent_bidi_paragraph_direction): Set
-        bidi_it.w member from it->w.
+        (push_prefix_prop, Fcurrent_bidi_paragraph_direction):
+        Set bidi_it.w member from it->w.
         (compute_display_string_pos): Accept additional argument, the
         window being displayed, and pass it to Fget_char_property.
         (Bug#14575)
@@ -20,7 +51,7 @@
 
 2013-06-08  Jan Djärv  <jan.h.d@swipnet.se>
 
-        * xgselect.c: Remove unneeded include xterm.h
+        * xgselect.c: Remove unneeded include xterm.h.
 
         * process.c (wait_reading_process_output): Check for NS before GLIB.
         GLIB may be linked in due to rsvg, but ns_select must be called.
@@ -322,8 +353,8 @@
         (update_frame_tool_bar): Update code for GNUStep.
         (clearAll): New method.
         (addDisplayItemWithImage:idx:tag:helpText:enabled:): Handle new tag
-        argument. Call insertItemWithItemIdentifier when NS_IMPL_GNUSTEP. Move
-        identifierToItem setObject and activeIdentifiers addObject before
+        argument. Call insertItemWithItemIdentifier when NS_IMPL_GNUSTEP.
+        Move identifierToItem setObject and activeIdentifiers addObject before
         call to insertItemWithItemIdentifier.
         (validateVisibleItems): Fix indentation.
         (toolbarAllowedItemIdentifiers:): Return activeIdentifiers.
@@ -337,7 +368,7 @@
         Use F suffix on floats.
         (ns_char_width): Returns CGFloat.
         (ns_ascii_average_width): w is CGFloat instead of float.
-        (nsfont_draw): cbuf and c are unsigned. Cast to char* in call to
+        (nsfont_draw): cbuf and c are unsigned.  Cast to char* in call to
         DPSxshow.
         (ns_glyph_metrics): CGFloat instead of float.
 
@@ -632,7 +663,7 @@
 
 2013-05-07  Paul Eggert  <eggert@cs.ucla.edu>
 
-        Use Gnulib ACL implementation, for benefit of Solaris etc. (Bug#14295)
+        Use Gnulib ACL implementation, for benefit of Solaris etc.  (Bug#14295)
         * Makefile.in (LIB_ACL): New macro.
         (LIBACL_LIBS): Remove.
         (LIBES): Use LIB_ACL, not LIBACL_LIBS.
@@ -3065,11 +3096,10 @@
 2012-12-31  Adam Sjøgren  <asjo@koldfront.dk>  (tiny change)
 
         * xterm.c (scroll-bar-adjust-thumb-portion): New variable to
-        determine whether scroll bar thumb size should be adjusted or
-        not. Use variable for MOTIF.
+        determine whether scroll bar thumb size should be adjusted or not.
+        Use variable for MOTIF.
 
-        * gtkutil.c (scroll-bar-adjust-thumb-portion): Use variable for
-        GTK.
+        * gtkutil.c (scroll-bar-adjust-thumb-portion): Use variable for GTK.
 
 2013-01-13  Jan Djärv  <jan.h.d@swipnet.se>
 
@@ -3614,7 +3644,7 @@
 
 2012-12-14  Paul Eggert  <eggert@cs.ucla.edu>
 
-        Fix permissions bugs with setgid directories etc. (Bug#13125)
+        Fix permissions bugs with setgid directories etc.  (Bug#13125)
         * dired.c (Ffile_attributes): Return t as the 9th attribute,
         to mark it as a placeholder.  The old value was often wrong.
         The only user of this attribute has been changed to use
diff --git a/src/ChangeLog.3 b/src/ChangeLog.3
index 2f798e1f0bc..fb1b96f738c 100644
--- a/src/ChangeLog.3
+++ b/src/ChangeLog.3
@@ -15447,7 +15447,7 @@
         * xterm.c (XTread_socket_hook): For X11, on map and unmap events
         check the window manager hints for iconification status.
 
-        * xterm.c (x_make_widow_icon): For X11, just request
+        * xterm.c (x_make_window_icon): For X11, just request
         iconification of the window manager.
 
 1989-05-08  Richard Stallman  (rms@sugar-bombs.ai.mit.edu)
diff --git a/src/fileio.c b/src/fileio.c
index 75e1f13a09b..ce5d4854fee 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -776,8 +776,9 @@ probably use `make-temp-file' instead, except in three circumstances:
 DEFUN ("expand-file-name", Fexpand_file_name, Sexpand_file_name, 1, 2, 0,
        doc: /* Convert filename NAME to absolute, and canonicalize it.
 Second arg DEFAULT-DIRECTORY is directory to start with if NAME is relative
-\(does not start with slash or tilde); if DEFAULT-DIRECTORY is nil or missing,
-the current buffer's value of `default-directory' is used.
+\(does not start with slash or tilde); both the directory name and
+a directory's file name are accepted.  If DEFAULT-DIRECTORY is nil or
+missing, the current buffer's value of `default-directory' is used.
 NAME should be a string that is a valid file name for the underlying
 filesystem.
 File name components that are `.' are removed, and
diff --git a/src/keyboard.c b/src/keyboard.c
index d01ecb9432b..7cb4c4b91e3 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -8150,11 +8150,12 @@ parse_tool_bar_item (Lisp_Object key, Lisp_Object item)
 #if !defined (USE_GTK) && !defined (HAVE_NS)
           /* If we use build_desired_tool_bar_string to render the
              tool bar, the separator is rendered as an image.  */
-          PROP (TOOL_BAR_ITEM_IMAGES)
-            = menu_item_eval_property (Vtool_bar_separator_image_expression);
-          PROP (TOOL_BAR_ITEM_ENABLED_P) = Qnil;
-          PROP (TOOL_BAR_ITEM_SELECTED_P) = Qnil;
-          PROP (TOOL_BAR_ITEM_CAPTION) = Qnil;
+          set_prop (TOOL_BAR_ITEM_IMAGES,
+                    (menu_item_eval_property
+                     (Vtool_bar_separator_image_expression)));
+          set_prop (TOOL_BAR_ITEM_ENABLED_P, Qnil);
+          set_prop (TOOL_BAR_ITEM_SELECTED_P, Qnil);
+          set_prop (TOOL_BAR_ITEM_CAPTION, Qnil);
 #endif
           return 1;
         }
diff --git a/src/process.c b/src/process.c
index e51b45bd64f..a873dd0cdb2 100644
--- a/src/process.c
+++ b/src/process.c
@@ -7068,9 +7068,10 @@ init_process_emacs (void)
 #endif
     {
 #if defined HAVE_GLIB && !defined WINDOWSNT
-      /* Tickle glib's child-handling code so that it initializes its
+      /* Tickle glib's child-handling code.  Ask glib to wait for Emacs itself;
+         this should always fail, but is enough to initialize glib's
          private SIGCHLD handler.  */
-      g_source_unref (g_child_watch_source_new (0));
+      g_source_unref (g_child_watch_source_new (getpid ()));
 #endif
       catch_child_signal ();
     }
diff --git a/src/xdisp.c b/src/xdisp.c
index 5ec72407191..e1d6b0c9a27 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -3509,9 +3509,8 @@ compute_display_string_pos (struct text_pos *position,
 
   if (string && STRINGP (string->lstring))
     object1 = object = string->lstring;
-  else if (!string_p)
+  else if (w && !string_p)
     {
-      eassert (w != NULL);
       XSETWINDOW (object, w);
       object1 = Qnil;
     }
@@ -18971,16 +18970,19 @@ push_prefix_prop (struct it *it, Lisp_Object prop)
 static Lisp_Object
 get_it_property (struct it *it, Lisp_Object prop)
 {
-  Lisp_Object position;
+  Lisp_Object position, object = it->object;
 
-  if (STRINGP (it->object))
+  if (STRINGP (object))
     position = make_number (IT_STRING_CHARPOS (*it));
-  else if (BUFFERP (it->object))
-    position = make_number (IT_CHARPOS (*it));
+  else if (BUFFERP (object))
+    {
+      position = make_number (IT_CHARPOS (*it));
+      object = it->window;
+    }
   else
     return Qnil;
 
-  return Fget_char_property (position, prop, it->object);
+  return Fget_char_property (position, prop, object);
 }
 
 /* See if there's a line- or wrap-prefix, and if so, push it on IT.  */
@@ -20010,7 +20012,10 @@ See also `bidi-paragraph-direction'.  */)
       itb.string.lstring = Qnil;
       itb.string.bufpos = 0;
       itb.string.unibyte = 0;
-      itb.w = XWINDOW (selected_window);
+      /* We have no window to use here for ignoring window-specific
+         overlays.  Using NULL for window pointer will cause
+         compute_display_string_pos to use the current buffer.  */
+      itb.w = NULL;
       bidi_paragraph_init (NEUTRAL_DIR, &itb, 1);
       bidi_unshelve_cache (itb_data, 0);
       set_buffer_temp (old);