Merge from emacs-24

6 files changed, 60 insertions, 13 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index cf352183414..7bb16668406 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,22 @@
+2014-11-16  Eli Zaretskii  <eliz@gnu.org>
+
+        * window.c (window_scroll_pixel_based): Avoid truncation/rounding
+        errors in computing the number of pixels to scroll.  Suggested by
+        Kelly Dean <kelly@prtime.org>.  (Bug#19060)
+
+2014-11-16  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * nsmenu.m (update_frame_tool_bar): If tool bar changes height,
+        call updateFrameSize.
+
+        * nsterm.m (setFrame:): Remove call to display (Bug#18757).
+
+2014-11-16  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * nsfns.m (x_set_foreground_color, x_set_background_color)
+        (x_set_cursor_color, Fxw_color_values): Block/unblock input,
+        use SET_FRAME_GARBAGED instead of redraw_frame (Bug#19036).
+
 2014-11-15  Jan Djärv  <jan.h.d@swipnet.se>
 
         * nsterm.m (ns_send_appdefined): Check for application defined
@@ -6,7 +25,7 @@
 
 2014-11-14  David Reitter  <david.reitter@gmail.com>
 
-        * nsterm.m (run): set timeout for event loop to prevent hang.
+        * nsterm.m (run): Set timeout for event loop to prevent hang.
         (Bug#18993)
 
 2014-11-14  Paul Eggert  <eggert@cs.ucla.edu>
@@ -2856,8 +2875,7 @@
         Consider horizontal scroll bar.
         (check_frame_size, adjust_window_margins): Remove functions and
         corresponding calls.
-        (set_window_buffer): Initialize old_pointm and horizontal scroll
-        bars.
+        (set_window_buffer): Initialize old_pointm and horizontal scroll bars.
         (temp_output_buffer_show): Reset hscroll related fields.
         Initialize old_pointm.
         (make_parent_window): Initialize old_pointm.
diff --git a/src/nsfns.m b/src/nsfns.m
index c4b273c3bf5..4f158f4c51e 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -280,9 +280,14 @@ x_set_foreground_color (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
   NSColor *col;
   EmacsCGFloat r, g, b, alpha;
 
+  /* Must block_input, because ns_lisp_to_color does block/unblock_input
+     which means that col may be deallocated in its unblock_input if there
+     is user input, unless we also block_input.  */
+  block_input ();
   if (ns_lisp_to_color (arg, &col))
     {
       store_frame_param (f, Qforeground_color, oldval);
+      unblock_input ();
       error ("Unknown color");
     }
 
@@ -299,8 +304,9 @@ x_set_foreground_color (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
       update_face_from_frame_parameter (f, Qforeground_color, arg);
       /*recompute_basic_faces (f); */
       if (FRAME_VISIBLE_P (f))
-        redraw_frame (f);
+        SET_FRAME_GARBAGED (f);
     }
+  unblock_input ();
 }
 
 
@@ -312,9 +318,11 @@ x_set_background_color (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
   NSView *view = FRAME_NS_VIEW (f);
   EmacsCGFloat r, g, b, alpha;
 
+  block_input ();
   if (ns_lisp_to_color (arg, &col))
     {
       store_frame_param (f, Qbackground_color, oldval);
+      unblock_input ();
       error ("Unknown color");
     }
 
@@ -351,8 +359,9 @@ x_set_background_color (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
         }
 
       if (FRAME_VISIBLE_P (f))
-        redraw_frame (f);
+        SET_FRAME_GARBAGED (f);
     }
+  unblock_input ();
 }
 
 
@@ -361,9 +370,11 @@ x_set_cursor_color (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
 {
   NSColor *col;
 
+  block_input ();
   if (ns_lisp_to_color (arg, &col))
     {
       store_frame_param (f, Qcursor_color, oldval);
+      unblock_input ();
       error ("Unknown color");
     }
 
@@ -376,6 +387,7 @@ x_set_cursor_color (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
       x_update_cursor (f, 1);
     }
   update_face_from_frame_parameter (f, Qcursor_color, arg);
+  unblock_input ();
 }
 
 
@@ -2331,11 +2343,16 @@ DEFUN ("xw-color-values", Fxw_color_values, Sxw_color_values, 1, 2, 0,
   check_window_system (NULL);
   CHECK_STRING (color);
 
+  block_input ();
   if (ns_lisp_to_color (color, &col))
-    return Qnil;
+    {
+      unblock_input ();
+      return Qnil;
+    }
 
   [[col colorUsingDefaultColorSpace]
         getRed: &red green: &green blue: &blue alpha: &alpha];
+  unblock_input ();
   return list3i (lrint (red * 65280), lrint (green * 65280),
                  lrint (blue * 65280));
 }
diff --git a/src/nsmenu.m b/src/nsmenu.m
index a90cb970874..0e8b68b38f1 100644
--- a/src/nsmenu.m
+++ b/src/nsmenu.m
@@ -1026,10 +1026,13 @@ update_frame_tool_bar (struct frame *f)
   EmacsView *view = FRAME_NS_VIEW (f);
   NSWindow *window = [view window];
   EmacsToolbar *toolbar = [view toolbar];
+  int oldh;
 
   if (view == nil || toolbar == nil) return;
   block_input ();
 
+  oldh = FRAME_TOOLBAR_HEIGHT (f);
+
 #ifdef NS_IMPL_COCOA
   [toolbar clearActive];
 #else
@@ -1136,6 +1139,8 @@ update_frame_tool_bar (struct frame *f)
   if (FRAME_TOOLBAR_HEIGHT (f) < 0) // happens if frame is fullscreen.
     FRAME_TOOLBAR_HEIGHT (f) = 0;
 
+  if (oldh != FRAME_TOOLBAR_HEIGHT (f))
+    [view updateFrameSize:YES];
   if (view->wait_for_tool_bar && FRAME_TOOLBAR_HEIGHT (f) > 0)
     {
       view->wait_for_tool_bar = NO;
diff --git a/src/nsterm.m b/src/nsterm.m
index c36b9ed4554..8729fa55a92 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -7213,7 +7213,6 @@ if (cols > 0 && rows > 0)
   if (pixel_height == 0) pixel_height = 1;
   min_portion = 20 / pixel_height;
   [super setFrame: newRect];
-  [self display];
 /*  unblock_input (); */
 }
 
diff --git a/src/window.c b/src/window.c
index e4ff2b41806..7c2b3ca29d2 100644
--- a/src/window.c
+++ b/src/window.c
@@ -4950,9 +4950,14 @@ window_scroll_pixel_based (Lisp_Object window, int n, bool whole, int noerror)
         {
           int px;
           int dy = frame_line_height;
+          /* In the below we divide the window box height by the
+             frame's line height to make the result predictable when
+             the window box is not an integral multiple of the line
+             height.  This is important to ensure we get back to the
+             same position when scrolling up, then down.  */
           if (whole)
-            dy = max ((window_box_height (w)
-                       - next_screen_context_lines * dy),
+            dy = max ((window_box_height (w) / dy
+                       - next_screen_context_lines) * dy,
                       dy);
           dy *= n;
 
@@ -5034,9 +5039,12 @@ window_scroll_pixel_based (Lisp_Object window, int n, bool whole, int noerror)
     {
       ptrdiff_t start_pos = IT_CHARPOS (it);
       int dy = frame_line_height;
-
-      dy = max ((window_box_height (w)
-                 - next_screen_context_lines * dy),
+      /* In the below we divide the window box height by the frame's
+         line height to make the result predictable when the window
+         box is not an integral multiple of the line height.  This is
+         important to ensure we get back to the same position when
+         scrolling up, then down.  */
+      dy = max ((window_box_height (w) / dy - next_screen_context_lines) * dy,
                 dy) * n;
 
       /* Note that move_it_vertically always moves the iterator to the
diff --git a/src/window.h b/src/window.h
index ea5dddc9fc8..4e4c65b83e6 100644
--- a/src/window.h
+++ b/src/window.h
@@ -519,7 +519,7 @@ wset_next_buffers (struct window *w, Lisp_Object val)
 #define WINDOW_FRAME_COLUMN_WIDTH(W) \
   (FRAME_COLUMN_WIDTH (WINDOW_XFRAME ((W))))
 
-/* Return the canonical column width of the frame of window W.  */
+/* Return the canonical line height of the frame of window W.  */
 #define WINDOW_FRAME_LINE_HEIGHT(W) \
   (FRAME_LINE_HEIGHT (WINDOW_XFRAME ((W))))