mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-26 07:33:47 +00:00
Code Issues Releases Activity

Merge from emacs-24; up to 117689

Browse Source
This commit is contained in:
Glenn Morris 2014-11-08 13:32:10 -08:00
commit 089c6aab18
4 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/ChangeLog
View File

@ -1,3 +1,9 @@
2014-11-08 Glenn Morris <rgm@gnu.org>
* 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 <michael.albinus@gmx.de>
* net/tramp.el (tramp-check-cached-permissions): Include hop in

7
lisp/emacs-lisp/bytecomp.el
View File

@ -1165,10 +1165,13 @@ Each function's symbol gets added to `byte-compile-noruntime-functions'."
(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

2
src/ChangeLog
View File

@ -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 <michael.albinus@gmx.de>

7
src/nsterm.m
View File

@ -3759,6 +3759,7 @@ overwriting cursor (usually when cursor on a tab) */
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 @@ overwriting cursor (usually when cursor on a tab) */
}
else
view->scrollbarsNeedingUpdate--;
update_p = NO;
}
}
@ -3814,6 +3816,7 @@ overwriting cursor (usually when cursor on a tab) */
bar = [[EmacsScroller alloc] initFrame: r window: win];
wset_vertical_scroll_bar (window, make_save_ptr (bar));
update_p = YES;
}
else
{
@ -3916,10 +3919,12 @@ overwriting cursor (usually when cursor on a tab) */
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 ();
}