merge trunk

12 files changed, 157 insertions, 57 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 8df6e31521d..556fcce5fa5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,37 @@
+2014-01-11  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (try_window_id): Don't use this function's optimizations
+        if overlays in the buffer displayed by the window have changed
+        since last redisplay.  (Bug#16347)
+        (message_dolog): Fix indentation.
+
+2014-01-11  Martin Rudalics  <rudalics@gmx.at>
+
+        * frame.c (frame_resize_pixelwise): Fix doc-string.
+
+2014-01-10  Martin Rudalics  <rudalics@gmx.at>
+
+        Fix handling of internal borders (Bug#16348).
+        * dispnew.c (adjust_frame_glyphs_for_window_redisplay): Remove
+        internal border width from pixel width of windows.
+        (change_frame_size_1): Don't return early when frame's pixel
+        size changes - we still have to record the new sizes in the
+        frame structure.
+        * w32fns.c (x_set_tool_bar_lines): Clear internal border width
+        also when toolbar gets larger.
+        * window.c (check_frame_size): Include internal_border_width in
+        check.
+        * xdisp.c (Ftool_bar_height): Fix doc-string typo.
+        * xfns.c (x_set_menu_bar_lines, x_set_tool_bar_lines): In
+        non-toolkit/non-GTK version clear internal border.
+        * xterm.c (x_clear_under_internal_border): New function for
+        non-toolkit/non-GTK version.
+        (x_after_update_window_line): In non-toolkit/non-GTK version
+        don't do that.
+        (handle_one_xevent, x_set_window_size): Call
+        x_clear_under_internal_border in non-toolkit/non-GTK version.
+        * xterm.h (x_clear_under_internal_border): Extern it.
+
 2014-01-07  Paul Eggert  <eggert@cs.ucla.edu>
 
         Fix misdisplay of interlaced GIFs with libgif5 (Bug#16372).
@@ -654,7 +688,7 @@
         * conf_post.h: Include <stdbool.h>.
         (bool_bf): New type.
         * dispextern.h (TRACE, PREPARE_FACE_FOR_DISPLAY):
-        * interval.h (RESET_INTERVAL, COPY_INTERVAL_CACHE, MERGE_INTERVAL_CACHE)
+        * intervals.h (RESET_INTERVAL, COPY_INTERVAL_CACHE, MERGE_INTERVAL_CACHE)
         Surround statement macro with proper 'do { ... } while (false)' brackets.
         * dispextern.h (IF_DEBUG): Properly parenthesize and convert to void.
         Args must now be expressions; all callers changed.
@@ -3447,7 +3481,7 @@
         (Qbool_vector_p): Declare.
         (CHECK_BOOL_VECTOR, ROUNDUP, BITS_PER_SIZE_T): New macros.
         (swap16, swap32, swap64): New inline functions.
-        * macfont.c (macfont_shape): Change lint_assume to assume.
+        * macfont.m (macfont_shape): Change lint_assume to assume.
         * ralloc.c: Rename ROUNDUP to PAGE_ROUNDUP throughout.
         * xsettings.c (parse_settings): Use new swap16 and
         swap32 from lisp.h instead of file-specific macros.
@@ -3511,7 +3545,7 @@
         * process.h, process.c (PROCESS_INLINE):
         * syntax.h, syntax.c (SYNTAX_INLINE):
         * systime.h, sysdep.c (SYSTIME_INLINE):
-        * termhooks.h, terminal.h (TERMHOOKS_INLINE):
+        * termhooks.h, terminal.c (TERMHOOKS_INLINE):
         * window.h, window.c (WINDOW_INLINE):
         Remove.  All uses replaced with INLINE.
 
@@ -3718,7 +3752,7 @@
         (x_handle_dnd_message):
         * xsettings.c (xft_settings_event):
         Use 'const XEvent * const' where appropriate.
-        * xterm.h, gtkutil.h, xsettngs.h: Adjust related prototypes.
+        * xterm.h, gtkutil.h, xsettings.h: Adjust related prototypes.
 
 2013-09-16  Dmitry Antipov  <dmantipov@yandex.ru>
 
@@ -3760,7 +3794,7 @@
         (Fx_create_frame): Register macfont driver, make a better default font.
         (Fns_popup_font_panel): Get font from macfont driver, if used.
 
-        * macfont.m, macfont.h, maccuvs.h: New files.
+        * macfont.m, macfont.h, macuvs.h: New files.
 
         * font.h: Declare syms_of_macfont.
 
@@ -6065,7 +6099,7 @@
         New unwind-protect flavors to better type-check C callbacks.
         This also lessens the need to write wrappers for callbacks,
         and the need for make_save_pointer.
-        * alloca.c (free_save_value):
+        * alloc.c (free_save_value):
         * atimer.c (run_all_atimers):
         Now extern.
         * alloc.c (safe_alloca_unwind):
@@ -6074,13 +6108,13 @@
         * menu.c (cleanup_popup_menu) [HAVE_NS]:
         * minibuf.c (choose_minibuf_frame_1):
         * process.c (make_serial_process_unwind):
-        * xdisp.h (pop_message_unwind):
+        * xdisp.c (pop_message_unwind):
         * xselect.c (queue_selection_requests_unwind):
         Remove no-longer-needed wrapper.  All uses replaced by the wrappee.
-        * alloca.c (record_xmalloc):
+        * alloc.c (record_xmalloc):
         Prefer record_unwind_protect_ptr to record_unwind_protect with
         make_save_pointer.
-        * alloca.c (Fgarbage_collect):
+        * alloc.c (Fgarbage_collect):
         Prefer record_unwind_protect_void to passing a dummy.
         * buffer.c (restore_buffer):
         * window.c (restore_window_configuration):
@@ -6686,8 +6720,8 @@
         Use emacs_open more consistently when opening files.
         This handles EINTR more consistently now, and makes it easier
         to introduce other uniform changes to file descriptor handling.
-        * src/systdio.h: New file.
-        * src/buffer.c (mmap_init):
+        * sysstdio.h: New file.
+        * buffer.c (mmap_init):
         * cygw32.c (chdir_to_default_directory):
         * dispnew.c (Fopen_termscript):
         * emacs.c (Fdaemon_initialized):
diff --git a/src/ChangeLog.12 b/src/ChangeLog.12
index 07aedadccae..a9a1d9b1326 100644
--- a/src/ChangeLog.12
+++ b/src/ChangeLog.12
@@ -2400,7 +2400,7 @@
         * w32term.h (x_char_width, x_char_height): Likewise.
         * xfns.c (x_char_width, x_char_height): Remove.
         * w32fns.c (x_char_width, x_char_height): Likewise.
-        * nsfns.c (x_char_width, x_char_height): Likewise.
+        * nsfns.m (x_char_width, x_char_height): Likewise.
         * frame.c (Fframe_char_width): Use FRAME_COLUMN_WIDTH for
         all window frames.
         (Fframe_char_height): Likewise with FRAME_LINE_HEIGHT.
diff --git a/src/ChangeLog.3 b/src/ChangeLog.3
index 1a2763f8ff8..cee5d43ed57 100644
--- a/src/ChangeLog.3
+++ b/src/ChangeLog.3
@@ -15138,8 +15138,8 @@
 
 1989-06-23  Joseph Arceneaux  (jla@apple-gunkies.ai.mit.edu)
 
-        * xfns.c, lisp/term/x-win.el: C routine Fscreen_color_p now lisp
-        function x-color-screen-p in x-win.el.
+        * xfns.c: C routine Fscreen_color_p now lisp
+        function x-color-screen-p in lisp/term/x-win.el.
         (x_set_cursor_color): New method: first disallow same cursor as
         background, then if cursor not foreground, use it as cursor
         foreground.
diff --git a/src/dispnew.c b/src/dispnew.c
index c3cca33b187..e11d143d0b5 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -2055,7 +2055,8 @@ adjust_frame_glyphs_for_window_redisplay (struct frame *f)
     w->left_col = 0;
     w->pixel_top = 0;
     w->top_line = 0;
-    w->pixel_width = FRAME_PIXEL_WIDTH (f);
+    w->pixel_width = (FRAME_PIXEL_WIDTH (f)
+                      - 2 * FRAME_INTERNAL_BORDER_WIDTH (f));
     w->total_cols = FRAME_TOTAL_COLS (f);
     w->pixel_height = FRAME_MENU_BAR_HEIGHT (f);
     w->total_lines = FRAME_MENU_BAR_LINES (f);
@@ -5515,7 +5516,11 @@ change_frame_size_1 (struct frame *f, int new_width, int new_height,
      example, fullscreen and remove/add scroll bar.  */
   if (new_text_height == FRAME_TEXT_HEIGHT (f)
       && new_text_width == FRAME_TEXT_WIDTH (f)
-      && new_root_width == old_root_width)
+      && new_root_width == old_root_width
+      && (FRAME_PIXEL_HEIGHT (f) ==
+          FRAME_TEXT_TO_PIXEL_HEIGHT (f, new_text_height))
+      && (FRAME_PIXEL_WIDTH (f) ==
+          FRAME_TEXT_TO_PIXEL_WIDTH (f, new_text_width)))
     return;
 
   block_input ();
diff --git a/src/font.c b/src/font.c
index cb0a28a524b..fa097c7d7e6 100644
--- a/src/font.c
+++ b/src/font.c
@@ -4429,7 +4429,7 @@ where
   LANGSYS is a symbol specifying a langsys tag of OpenType,
   GSUB and GPOS, if non-nil, are lists of symbols specifying feature tags.
 
-If LANGYS is nil, the default langsys is selected.
+If LANGSYS is nil, the default langsys is selected.
 
 The features are applied in the order they appear in the list.  The
 symbol `*' means to apply all available features not present in this
diff --git a/src/frame.c b/src/frame.c
index 76883820672..703c67a3b1e 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -4709,7 +4709,6 @@ or call the function `tool-bar-mode'.  */);
 
   DEFVAR_KBOARD ("default-minibuffer-frame", Vdefault_minibuffer_frame,
                  doc: /* Minibufferless frames use this frame's minibuffer.
-
 Emacs cannot create minibufferless frames unless this is set to an
 appropriate surrogate.
 
@@ -4730,9 +4729,15 @@ automatically.  See also `mouse-autoselect-window'.  */);
   focus_follows_mouse = 0;
 
   DEFVAR_BOOL ("frame-resize-pixelwise", frame_resize_pixelwise,
-               doc: /* Non-nil means frames are resized pixelwise.
-If this is nil, resizing a frame will round sizes to the frame's
-current values of `frame-char-height' and `frame-char-width'.  */);
+               doc: /* Non-nil means resize frames pixelwise.
+If this option is nil, resizing a frame rounds its sizes to the frame's
+current values of `frame-char-height' and `frame-char-width'.  If this
+is non-nil, no rounding occurs, hence frame sizes can increase/decrease
+by one pixel.
+
+With some window managers you have to set this to non-nil in order to
+fully maximize frames.  The default of this option is nil.  To resize
+your initial frame pixelwise, set this option in your init file.  */);
   frame_resize_pixelwise = 0;
 
   staticpro (&Vframe_list);
diff --git a/src/w32fns.c b/src/w32fns.c
index 03779be036c..d6f3fe7a3eb 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -1713,26 +1713,23 @@ x_set_tool_bar_lines (struct frame *f, Lisp_Object value, Lisp_Object oldval)
   /* If the tool bar gets smaller, the internal border below it
      has to be cleared.  It was formerly part of the display
      of the larger tool bar, and updating windows won't clear it.  */
-  if (delta < 0)
+  if (FRAME_INTERNAL_BORDER_WIDTH (f) != 0)
     {
       int height = FRAME_INTERNAL_BORDER_WIDTH (f);
       int width = FRAME_PIXEL_WIDTH (f);
       int y = nlines * unit;
+      HDC hdc = get_frame_dc (f);
 
       block_input ();
-      {
-        HDC hdc = get_frame_dc (f);
-        w32_clear_area (f, hdc, 0, y, width, height);
-        release_frame_dc (f, hdc);
-      }
+      w32_clear_area (f, hdc, 0, y, width, height);
+      release_frame_dc (f, hdc);
       unblock_input ();
-
-      if (WINDOWP (f->tool_bar_window))
-        clear_glyph_matrix (XWINDOW (f->tool_bar_window)->current_matrix);
     }
 
-  run_window_configuration_change_hook (f);
+  if (delta < 0 && WINDOWP (f->tool_bar_window))
+    clear_glyph_matrix (XWINDOW (f->tool_bar_window)->current_matrix);
 
+  run_window_configuration_change_hook (f);
 }
 
 
diff --git a/src/window.c b/src/window.c
index f85627ac49f..bd319f5be8f 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3155,6 +3155,7 @@ check_frame_size (struct frame *frame, int *width, int *height, bool pixelwise)
         min_height = 2 * min_height;
 
       min_height += FRAME_TOP_MARGIN_HEIGHT (frame);
+      min_height += FRAME_INTERNAL_BORDER_WIDTH (frame);
 
       if (*height < min_height)
         *height = min_height;
@@ -4047,6 +4048,8 @@ resize_frame_windows (struct frame *f, int size, bool horflag, bool pixelwise)
      have implicitly given us a zero or negative height.  */
   if (pixelwise)
     {
+      /* Note: This does not include the size for internal borders
+         since these are not part of the frame's text area.  */
       new_pixel_size = max (horflag
                             ? size
                             : (size
diff --git a/src/xdisp.c b/src/xdisp.c
index 404c8a61e52..8efe3492db0 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -9854,7 +9854,7 @@ message_dolog (const char *m, ptrdiff_t nbytes, bool nlflag, bool multibyte)
          incrementing windows_or_buffers_changed even if *Messages* is
          shown in some window.  So we must manually set
          windows_or_buffers_changed here to make up for that.  */
-        windows_or_buffers_changed = old_windows_or_buffers_changed;
+      windows_or_buffers_changed = old_windows_or_buffers_changed;
       bset_redisplay (current_buffer);
 
       set_buffer_internal (oldbuf);
@@ -12109,7 +12109,7 @@ DEFUN ("tool-bar-height", Ftool_bar_height, Stool_bar_height,
        0, 2, 0,
        doc: /* Return the number of lines occupied by the tool bar of FRAME.
 If FRAME is nil or omitted, use the selected frame.  Optional argument
-PIXELWISE non-nil means return the height of the tool bar inpixels.  */)
+PIXELWISE non-nil means return the height of the tool bar in pixels.  */)
   (Lisp_Object frame, Lisp_Object pixelwise)
 {
   int height = 0;
@@ -17333,9 +17333,16 @@ row_containing_pos (struct window *w, ptrdiff_t charpos,
 
    Value is
 
-   1    if display has been updated
-   0    if otherwise unsuccessful
+   >= 1 if successful, i.e. display has been updated
+         specifically:
+         1 means the changes were in front of a newline that precedes
+           the window start, and the whole current matrix was reused
+         2 means the changes were after the last position displayed
+           in the window, and the whole current matrix was reused
+         3 means portions of the current matrix were reused, while
+           some of the screen lines were redrawn
    -1   if redisplay with same window start is known not to succeed
+   0    if otherwise unsuccessful
 
    The following steps are performed:
 
@@ -17410,6 +17417,12 @@ try_window_id (struct window *w)
   if (windows_or_buffers_changed || f->cursor_type_changed)
     GIVE_UP (2);
 
+  /* This function's optimizations cannot be used if overlays have
+     changed in the buffer displayed by the window, so give up if they
+     have.  */
+  if (w->last_overlay_modified != OVERLAY_MODIFF)
+    GIVE_UP (21);
+
   /* Verify that narrowing has not changed.
      Also verify that we were not told to prevent redisplay optimizations.
      It would be nice to further
diff --git a/src/xfns.c b/src/xfns.c
index a78c2bf6b76..debc707dba2 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -998,6 +998,8 @@ x_set_menu_bar_lines (struct frame *f, Lisp_Object value, Lisp_Object oldval)
   FRAME_MENU_BAR_LINES (f) = nlines;
   FRAME_MENU_BAR_HEIGHT (f) = nlines * FRAME_LINE_HEIGHT (f);
   resize_frame_windows (f, FRAME_TEXT_HEIGHT (f), 0, 1);
+  if (FRAME_X_WINDOW (f))
+    x_clear_under_internal_border (f);
 
   /* If the menu bar height gets changed, the internal border below
      the top margin has to be cleared.  Also, if the menu bar gets
@@ -1110,8 +1112,11 @@ x_set_tool_bar_lines (struct frame *f, Lisp_Object value, Lisp_Object oldval)
 
   FRAME_TOOL_BAR_LINES (f) = nlines;
   FRAME_TOOL_BAR_HEIGHT (f) = nlines * FRAME_LINE_HEIGHT (f);
-  ++windows_or_buffers_changed;
   resize_frame_windows (f, FRAME_TEXT_HEIGHT (f), 0, 1);
+#if !defined USE_X_TOOLKIT && !defined USE_GTK
+  if (FRAME_X_WINDOW (f))
+    x_clear_under_internal_border (f);
+#endif
   adjust_frame_glyphs (f);
 
   /* We also have to make sure that the internal border at the top of
diff --git a/src/xterm.c b/src/xterm.c
index f47d73cf7ed..105aaed2972 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -593,6 +593,32 @@ XTframe_up_to_date (struct frame *f)
 }
 
 
+/* Clear under internal border if any for non-toolkit builds. */
+
+
+#if !defined USE_X_TOOLKIT && !defined USE_GTK
+void
+x_clear_under_internal_border (struct frame *f)
+{
+  if (FRAME_INTERNAL_BORDER_WIDTH (f) > 0)
+    {
+      Display *display = FRAME_X_DISPLAY (f);
+      Window window = FRAME_X_WINDOW (f);
+      int border = FRAME_INTERNAL_BORDER_WIDTH (f);
+      int width = FRAME_PIXEL_WIDTH (f);
+      int height = FRAME_PIXEL_HEIGHT (f);
+      int margin = FRAME_TOP_MARGIN_HEIGHT (f);
+
+      block_input ();
+      x_clear_area (display, window, 0, 0, border, height);
+      x_clear_area (display, window, 0, margin, width, border);
+      x_clear_area (display, window, width - border, 0, border, height);
+      x_clear_area (display, window, 0, height - border, width, border);
+      unblock_input ();
+    }
+}
+#endif
+
 /* Draw truncation mark bitmaps, continuation mark bitmaps, overlay
    arrow bitmaps, or clear the fringes if no bitmaps are required
    before DESIRED_ROW is made current.  This function is called from
@@ -602,38 +628,42 @@ XTframe_up_to_date (struct frame *f)
 static void
 x_after_update_window_line (struct window *w, struct glyph_row *desired_row)
 {
-  struct frame *f;
-  int width, height;
-
   eassert (w);
 
   if (!desired_row->mode_line_p && !w->pseudo_window_p)
     desired_row->redraw_fringe_bitmaps_p = 1;
 
+#ifdef USE_X_TOOLKIT
   /* When a window has disappeared, make sure that no rest of
      full-width rows stays visible in the internal border.  Could
      check here if updated window is the leftmost/rightmost window,
      but I guess it's not worth doing since vertically split windows
      are almost never used, internal border is rarely set, and the
      overhead is very small.  */
-  if (windows_or_buffers_changed
-      && desired_row->full_width_p
-      && (f = XFRAME (w->frame),
-          width = FRAME_INTERNAL_BORDER_WIDTH (f),
-          width != 0)
-      && (height = desired_row->visible_height,
-          height > 0))
-    {
-      int y = WINDOW_TO_FRAME_PIXEL_Y (w, max (0, desired_row->y));
+  {
+    struct frame *f;
+    int width, height;
+
+    if (windows_or_buffers_changed
+        && desired_row->full_width_p
+        && (f = XFRAME (w->frame),
+            width = FRAME_INTERNAL_BORDER_WIDTH (f),
+            width != 0)
+        && (height = desired_row->visible_height,
+            height > 0))
+      {
+        int y = WINDOW_TO_FRAME_PIXEL_Y (w, max (0, desired_row->y));
 
-      block_input ();
-      x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
-                    0, y, width, height);
-      x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
-                    FRAME_PIXEL_WIDTH (f) - width,
-                    y, width, height);
-      unblock_input ();
-    }
+        block_input ();
+        x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
+                      0, y, width, height);
+        x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
+                      FRAME_PIXEL_WIDTH (f) - width,
+                      y, width, height);
+        unblock_input ();
+      }
+  }
+#endif
 }
 
 static void
@@ -6618,7 +6648,8 @@ handle_one_xevent (struct x_display_info *dpyinfo,
               || event->xconfigure.height != FRAME_PIXEL_HEIGHT (f))
             {
               change_frame_size (f, width, height, 0, 1, 0, 1);
-              SET_FRAME_GARBAGED (f);
+              x_clear_under_internal_border (f);
+              SET_FRAME_GARBAGED (f);
               cancel_mouse_face (f);
             }
 
@@ -8635,6 +8666,9 @@ x_set_window_size (struct frame *f, int change_gravity, int width, int height, b
 #else /* not USE_GTK */
 
   x_set_window_size_1 (f, change_gravity, width, height, pixelwise);
+#if !defined USE_X_TOOLKIT
+  x_clear_under_internal_border (f);
+#endif
 
 #endif /* not USE_GTK */
 
diff --git a/src/xterm.h b/src/xterm.h
index 7278f990528..3e79d46702c 100644
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -1049,6 +1049,10 @@ extern void x_session_close (void);
 
 extern Lisp_Object Qx_gtk_map_stock;
 
+#if !defined USE_X_TOOLKIT && !defined USE_GTK
+extern void x_clear_under_internal_border (struct frame *f);
+#endif
+
 /* Is the frame embedded into another application? */
 
 #define FRAME_X_EMBEDDED_P(f) (FRAME_X_OUTPUT(f)->explicit_parent != 0)