Merge branch 'master' into cairo

14 files changed, 68 insertions, 38 deletions

diff --git a/src/buffer.c b/src/buffer.c
index b09676c438d..c78d08c53d2 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1467,15 +1467,15 @@ DEFUN ("other-buffer", Fother_buffer, Sother_buffer, 0, 3, 0,
 Buffers not visible in windows are preferred to visible buffers, unless
 optional second argument VISIBLE-OK is non-nil.  Ignore the argument
 BUFFER unless it denotes a live buffer.  If the optional third argument
-FRAME is non-nil, use that frame's buffer list instead of the selected
-frame's buffer list.
+FRAME specifies a live frame, then use that frame's buffer list instead
+of the selected frame's buffer list.
 
 The buffer is found by scanning the selected or specified frame's buffer
 list first, followed by the list of all buffers.  If no other buffer
 exists, return the buffer `*scratch*' (creating it if necessary).  */)
   (Lisp_Object buffer, Lisp_Object visible_ok, Lisp_Object frame)
 {
-  struct frame *f = decode_any_frame (frame);
+  struct frame *f = decode_live_frame (frame);
   Lisp_Object tail = f->buffer_list, pred = f->buffer_predicate;
   Lisp_Object buf, notsogood = Qnil;
 
@@ -6106,7 +6106,7 @@ An entry of the form POSITION indicates that point was at the buffer
 location given by the integer.  Undoing an entry of this form places
 point at POSITION.
 
-Entries with value `nil' mark undo boundaries.  The undo command treats
+Entries with value nil mark undo boundaries.  The undo command treats
 the changes between two undo boundaries as a single step to be undone.
 
 If the value of the variable is t, undo information is not recorded.  */);
diff --git a/src/cmds.c b/src/cmds.c
index b590805ea8a..6f9982eebb2 100644
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -110,10 +110,17 @@ DEFUN ("forward-line", Fforward_line, Sforward_line, 0, 1, "^p",
 Precisely, if point is on line I, move to the start of line I + N
 \("start of line" in the logical order).
 If there isn't room, go as far as possible (no error).
+
 Returns the count of lines left to move.  If moving forward,
-that is N - number of lines moved; if backward, N + number moved.
-With positive N, a non-empty line at the end counts as one line
-successfully moved (for the return value).  */)
+that is N minus number of lines moved; if backward, N plus number
+moved.
+
+Exception: With positive N, a non-empty line at the end of the
+buffer, or of its accessible portion, counts as one line
+successfully moved (for the return value).  This means that the
+function will move point to the end of such a line and will count
+it as a line moved across, even though there is no next line to
+go to its beginning.  */)
   (Lisp_Object n)
 {
   ptrdiff_t opoint = PT, pos, pos_byte, shortage, count;
diff --git a/src/font.c b/src/font.c
index 603e998ed3f..2ccfd15d436 100644
--- a/src/font.c
+++ b/src/font.c
@@ -3822,17 +3822,17 @@ They are the same as face attributes of the same name.  See
 
 `:foundry'
 
-VALUE must be a string or a symbol specifying the font foundry, e.g. ``misc''.
+VALUE must be a string or a symbol specifying the font foundry, e.g. `misc'.
 
 `:adstyle'
 
 VALUE must be a string or a symbol specifying the additional
-typographic style information of a font, e.g. ``sans''.
+typographic style information of a font, e.g. `sans'.
 
 `:registry'
 
 VALUE must be a string or a symbol specifying the charset registry and
-encoding of a font, e.g. ``iso8859-1''.
+encoding of a font, e.g. `iso8859-1'.
 
 `:size'
 
@@ -3866,7 +3866,7 @@ required OpenType features.
   GSUB: List of OpenType GSUB feature tag symbols, or nil if none required.
   GPOS: List of OpenType GPOS feature tag symbols, or nil if none required.
 
-GSUB and GPOS may contain `nil' element.  In such a case, the font
+GSUB and GPOS may contain nil elements.  In such a case, the font
 must not have any of the remaining elements.
 
 For instance, if the VALUE is `(thai nil nil (mark))', the font must
@@ -5011,7 +5011,7 @@ build_style_table (const struct table_entry *entry, int nelement)
 static Lisp_Object Vfont_log_deferred;
 
 /* Prepend the font-related logging data in Vfont_log if it is not
-   `t'.  ACTION describes a kind of font-related action (e.g. listing,
+   t.  ACTION describes a kind of font-related action (e.g. listing,
    opening), ARG is the argument for the action, and RESULT is the
    result of the action.  */
 void
diff --git a/src/frame.c b/src/frame.c
index 22086552ea3..478bb00337b 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -1823,9 +1823,10 @@ DEFUN ("delete-frame", Fdelete_frame, Sdelete_frame, 0, 2, "",
        doc: /* Delete FRAME, permanently eliminating it from use.
 FRAME defaults to the selected frame.
 
-A frame may not be deleted if its minibuffer is used by other frames.
-Normally, you may not delete a frame if all other frames are invisible,
-but if the second optional argument FORCE is non-nil, you may do so.
+A frame may not be deleted if its minibuffer serves as surrogate
+minibuffer for another frame.  Normally, you may not delete a frame if
+all other frames are invisible, but if the second optional argument
+FORCE is non-nil, you may do so.
 
 This function runs `delete-frame-functions' before actually
 deleting the frame, unless the frame is a tooltip.
@@ -5151,7 +5152,7 @@ a non-nil value in your init file.  */);
 If this option is nil, setting font, menu bar, tool bar, internal
 borders, fringes or scroll bars of a specific frame may resize the frame
 in order to preserve the number of columns or lines it displays.  If
-this option is `t', no such resizing is done.  Note that the size of
+this option is t, no such resizing is done.  Note that the size of
 fullscreen and maximized frames, the height of fullheight frames and the
 width of fullwidth frames never change implicitly.
 
@@ -5167,14 +5168,14 @@ Changing any of the parameters `scroll-bar-width', `scroll-bar-height',
 window.  This means, for example, that removing vertical scroll bars on
 a frame containing several side by side windows will shrink the frame
 width by the width of one scroll bar provided this option is nil and
-keep it unchanged if this option is either `t' or a list containing
+keep it unchanged if this option is either t or a list containing
 `vertical-scroll-bars'.
 
 The default value is '(tool-bar-lines) on Lucid, Motif and Windows
 \(which means that adding/removing a tool bar does not change the frame
 height), nil on all other window systems including GTK+ (which means
 that changing any of the parameters listed above may change the size of
-the frame), and `t' otherwise (which means the frame size never changes
+the frame), and t otherwise (which means the frame size never changes
 implicitly when there's no window system support).
 
 Note that when a frame is not large enough to accommodate a change of
diff --git a/src/gnutls.c b/src/gnutls.c
index 9b8ae2bd1a8..9c2d86ecdfc 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -1181,7 +1181,7 @@ gnutls_certificate_set_verify_flags.
 instead.
 
 :verify-error is a list of symbols to express verification checks or
-`t' to do all checks.  Currently it can contain `:trustfiles' and
+t to do all checks.  Currently it can contain `:trustfiles' and
 `:hostname' to verify the certificate or the hostname respectively.
 
 :min-prime-bits is the minimum accepted number of bits the client will
diff --git a/src/keyboard.c b/src/keyboard.c
index 77f7fb97898..eb66c445559 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1702,7 +1702,8 @@ adjust_point_for_property (ptrdiff_t last_pt, bool modified)
       if (check_display
           && PT > BEGV && PT < ZV
           && !NILP (val = get_char_property_and_overlay
-                              (make_number (PT), Qdisplay, Qnil, &overlay))
+                              (make_number (PT), Qdisplay, selected_window,
+                               &overlay))
           && display_prop_intangible_p (val, overlay, PT, PT_BYTE)
           && (!OVERLAYP (overlay)
               ? get_property_and_range (PT, Qdisplay, &val, &beg, &end, Qnil)
diff --git a/src/keymap.c b/src/keymap.c
index d10c00489d1..e9898051dc7 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -498,7 +498,7 @@ access_keymap_1 (Lisp_Object map, Lisp_Object idx,
             if (INTEGERP (idx) && (XFASTINT (idx) & CHAR_MODIFIER_MASK) == 0)
               {
                 val = Faref (binding, idx);
-                /* `nil' has a special meaning for char-tables, so
+                /* nil has a special meaning for char-tables, so
                    we use something else to record an explicitly
                    unbound entry.  */
                 if (NILP (val))
@@ -849,7 +849,7 @@ store_in_keymap (Lisp_Object keymap, register Lisp_Object idx, Lisp_Object def)
             if (NATNUMP (idx) && !(XFASTINT (idx) & CHAR_MODIFIER_MASK))
               {
                 Faset (elt, idx,
-                       /* `nil' has a special meaning for char-tables, so
+                       /* nil has a special meaning for char-tables, so
                           we use something else to record an explicitly
                           unbound entry.  */
                        NILP (def) ? Qt : def);
diff --git a/src/nsfns.m b/src/nsfns.m
index 8a3c6ccf2b0..6a2e2ff14a4 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -749,7 +749,7 @@ ns_implicitly_set_icon_type (struct frame *f)
        chain = XCDR (chain))
     {
       elt = XCAR (chain);
-      /* special case: 't' means go by file type */
+      /* special case: t means go by file type */
       if (SYMBOLP (elt) && EQ (elt, Qt) && SSDATA (f->name)[0] == '/')
         {
           NSString *str
@@ -2836,13 +2836,13 @@ elements (all size values are in pixels).
 
 - `title-bar-height' is the height of the title bar of FRAME.
 
-- `menu-bar-external' if `t' means the menu bar is external (not
+- `menu-bar-external' if t means the menu bar is external (not
   included in the inner edges of FRAME).
 
 - `menu-bar-size' is a cons of the width and height of the menu bar of
   FRAME.
 
-- `tool-bar-external' if `t' means the tool bar is external (not
+- `tool-bar-external' if t means the tool bar is external (not
   included in the inner edges of FRAME).
 
 - `tool-bar-side' tells tells on which side the tool bar on FRAME is and
diff --git a/src/w32fns.c b/src/w32fns.c
index b9d7bd4d75b..3a6fa624056 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -7535,13 +7535,13 @@ elements (all size values are in pixels).
 
 - `title-bar-height' is the height of the title bar of FRAME.
 
-- `menu-bar-external' if `t' means the menu bar is by default external
+- `menu-bar-external' if t means the menu bar is by default external
   (not included in the inner size of FRAME).
 
 - `menu-bar-size' is a cons of the width and height of the menu bar of
   FRAME.
 
-- `tool-bar-external' if `t' means the tool bar is by default external
+- `tool-bar-external' if t means the tool bar is by default external
   (not included in the inner size of FRAME).
 
 - `tool-bar-side' tells tells on which side the tool bar on FRAME is by
diff --git a/src/w32heap.c b/src/w32heap.c
index ee0eb161502..47ffec1c303 100644
--- a/src/w32heap.c
+++ b/src/w32heap.c
@@ -115,9 +115,9 @@ typedef struct _RTL_HEAP_PARAMETERS {
    to build only the first bootstrap-emacs.exe with the large size,
    and reset that to a lower value afterwards.  */
 #if defined _WIN64 || defined WIDE_EMACS_INT
-# define DUMPED_HEAP_SIZE (18*1024*1024)
+# define DUMPED_HEAP_SIZE (19*1024*1024)
 #else
-# define DUMPED_HEAP_SIZE (11*1024*1024)
+# define DUMPED_HEAP_SIZE (12*1024*1024)
 #endif
 
 static unsigned char dumped_data[DUMPED_HEAP_SIZE];
diff --git a/src/w32term.c b/src/w32term.c
index d415b13f715..089c43c8a26 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -1410,7 +1410,7 @@ x_draw_glyphless_glyph_string_foreground (struct glyph_string *s)
 
       if (glyph->u.glyphless.method == GLYPHLESS_DISPLAY_ACRONYM)
         {
-          if (len > 1
+          if (len > 0
               && CHAR_TABLE_P (Vglyphless_char_display)
               && (CHAR_TABLE_EXTRA_SLOTS (XCHAR_TABLE (Vglyphless_char_display))
                   >= 1))
diff --git a/src/xdisp.c b/src/xdisp.c
index c2f0b747c6e..87f110e667d 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -4899,6 +4899,20 @@ handle_single_display_spec (struct it *it, Lisp_Object spec, Lisp_Object object,
     {
       start_pos = *position;
       *position = display_prop_end (it, object, start_pos);
+      /* If the display property comes from an overlay, don't consider
+         any potential stop_charpos values before the end of that
+         overlay.  Since display_prop_end will happily find another
+         'display' property coming from some other overlay or text
+         property on buffer positions before this overlay's end, we
+         need to ignore them, or else we risk displaying this
+         overlay's display string/image twice.  */
+      if (!NILP (overlay))
+        {
+          ptrdiff_t ovendpos = OVERLAY_POSITION (OVERLAY_END (overlay));
+
+          if (ovendpos > CHARPOS (*position))
+            SET_TEXT_POS (*position, ovendpos, CHAR_TO_BYTE (ovendpos));
+        }
     }
   value = Qnil;
 
@@ -29145,6 +29159,7 @@ note_mode_line_or_margin_highlight (Lisp_Object window, int x, int y,
     }
 
   /* Change the mouse face according to what is under X/Y.  */
+  bool mouse_face_shown = false;
   if (STRINGP (string))
     {
       mouse_face = Fget_text_property (pos, Qmouse_face, string);
@@ -29267,13 +29282,18 @@ note_mode_line_or_margin_highlight (Lisp_Object window, int x, int y,
                                                                 glyph->face_id,
                                                                 true);
           show_mouse_face (hlinfo, DRAW_MOUSE_FACE);
+          mouse_face_shown = true;
 
           if (NILP (pointer))
             pointer = Qhand;
         }
-      else if ((area == ON_MODE_LINE) || (area == ON_HEADER_LINE))
-        clear_mouse_face (hlinfo);
     }
+
+  /* If mouse-face doesn't need to be shown, clear any existing
+     mouse-face.  */
+  if ((area == ON_MODE_LINE || area == ON_HEADER_LINE) && !mouse_face_shown)
+    clear_mouse_face (hlinfo);
+
 #ifdef HAVE_WINDOW_SYSTEM
   if (FRAME_WINDOW_P (f))
     define_frame_cursor1 (f, cursor, pointer);
diff --git a/src/xfns.c b/src/xfns.c
index 80c214a7a56..5ac58e9c7e0 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -4320,13 +4320,13 @@ elements (all size values are in pixels).
 
 - `title-bar-height' is the height of the title bar of FRAME.
 
-- `menu-bar-external' if `t' means the menu bar is external (not
+- `menu-bar-external' if t means the menu bar is external (not
   included in the inner edges of FRAME).
 
 - `menu-bar-size' is a cons of the width and height of the menu bar of
   FRAME.
 
-- `tool-bar-external' if `t' means the tool bar is external (not
+- `tool-bar-external' if t means the tool bar is external (not
   included in the inner edges of FRAME).
 
 - `tool-bar-side' tells tells on which side the tool bar on FRAME is and
diff --git a/src/xterm.c b/src/xterm.c
index 4590e34fe8b..3734fbfee92 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -7847,17 +7847,18 @@ handle_one_xevent (struct x_display_info *dpyinfo,
 
       f = any;
 
-#if ! defined (USE_GTK)
       /* If mouse-highlight is an integer, input clears out
          mouse highlighting.  */
       if (!hlinfo->mouse_face_hidden && INTEGERP (Vmouse_highlight)
+#if ! defined (USE_GTK)
           && (f == 0
-              || !EQ (f->tool_bar_window, hlinfo->mouse_face_window)))
+              || !EQ (f->tool_bar_window, hlinfo->mouse_face_window))
+#endif
+          )
         {
           clear_mouse_face (hlinfo);
           hlinfo->mouse_face_hidden = true;
         }
-#endif
 
 #if defined USE_MOTIF && defined USE_TOOLKIT_SCROLL_BARS
       if (f == 0)
@@ -12256,7 +12257,7 @@ static struct redisplay_interface x_redisplay_interface =
     x_draw_window_cursor,
     x_draw_vertical_window_border,
     x_draw_window_divider,
-    x_shift_glyphs_for_insert, /* Never called, se comment in function.  */
+    x_shift_glyphs_for_insert, /* Never called; see comment in function.  */
     x_show_hourglass,
     x_hide_hourglass
   };