[Emacs-diffs] trunk r118324: Merge from emacs-24; up to 117689

[Glenn Morris]

------------------------------------------------------------
revno: 118324 [merge]
revision-id: address@hidden
parent: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2014-11-08 13:32:10 -0800
message:
  Merge from emacs-24; up to 117689
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/emacs-lisp/bytecomp.el    bytecomp.el-20091113204419-o5vbwnq5f7feedwu-492
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/nsterm.m                   nsterm.m-20091113204419-o5vbwnq5f7feedwu-8747

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-11-08 18:21:38 +0000
+++ b/lisp/ChangeLog    2014-11-08 21:32:10 +0000
@@ -1,3 +1,9 @@
+2014-11-08  Glenn Morris  <address@hidden>
+
+       * emacs-lisp/bytecomp.el (byte-compile-report-error):
+       Allow the argument to be a string.  Due to the vague doc,
+       it was already being used this way.
+
 2014-11-08  Michael Albinus  <address@hidden>
 
        * net/tramp.el (tramp-check-cached-permissions): Include hop in

=== modified file 'lisp/emacs-lisp/bytecomp.el'
--- a/lisp/emacs-lisp/bytecomp.el       2014-11-08 17:46:21 +0000
+++ b/lisp/emacs-lisp/bytecomp.el       2014-11-08 21:32:10 +0000
@@ -1165,10 +1165,13 @@
        (byte-compile-warn "%s" msg)))))
 
 (defun byte-compile-report-error (error-info)
-  "Report Lisp error in compilation.  ERROR-INFO is the error data."
+  "Report Lisp error in compilation.
+ERROR-INFO is the error data, in the form of either (ERROR-SYMBOL . DATA)
+or STRING."
   (setq byte-compiler-error-flag t)
   (byte-compile-log-warning
-   (error-message-string error-info)
+   (if (stringp error-info) error-info
+     (error-message-string error-info))
    nil :error))
 
 ;;; sanity-checking arglists

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-11-08 18:21:38 +0000
+++ b/src/ChangeLog     2014-11-08 21:32:10 +0000
@@ -2,6 +2,8 @@
 
        * nsterm.m (run): Only use non-system event loop if OSX version is
        exactly 10.9 (Bug#18993).
+       (ns_set_vertical_scroll_bar): Don't call bar setPosition: unless
+       needed (Bug#18757).
 
 2014-11-08  Michael Albinus  <address@hidden>
 

=== modified file 'src/nsterm.m'
--- a/src/nsterm.m      2014-11-08 18:21:38 +0000
+++ b/src/nsterm.m      2014-11-08 21:32:10 +0000
@@ -3759,6 +3759,7 @@
   EmacsScroller *bar;
   int window_y, window_height;
   int top, left, height, width;
+  BOOL update_p = YES;
 
   /* optimization; display engine sends WAY too many of these.. */
   if (!NILP (window->vertical_scroll_bar))
@@ -3773,6 +3774,7 @@
             }
           else
             view->scrollbarsNeedingUpdate--;
+          update_p = NO;
         }
     }
 
@@ -3814,6 +3816,7 @@
 
       bar = [[EmacsScroller alloc] initFrame: r window: win];
       wset_vertical_scroll_bar (window, make_save_ptr (bar));
+      update_p = YES;
     }
   else
     {
@@ -3916,10 +3919,12 @@
           if (oldRect.origin.x != r.origin.x)
               ns_clear_frame_area (f, left, top, width, height);
           [bar setFrame: r];
+          update_p = YES;
         }
     }
 
-  [bar setPosition: position portion: portion whole: whole];
+  if (update_p)
+    [bar setPosition: position portion: portion whole: whole];
   unblock_input ();
 }