Commit 5c2a7148 authored by Stefan Monnier's avatar Stefan Monnier

* src/eval.c (Finteractive_p): Revert lexbind-merge mishap.

parent 96a68577
2012-11-15 Stefan Monnier <monnier@iro.umontreal.ca>
* eval.c (Finteractive_p): Revert lexbind-merge mishap.
2012-11-14 Eli Zaretskii <eliz@gnu.org> 2012-11-14 Eli Zaretskii <eliz@gnu.org>
* w32proc.c (timer_loop): Make sure SuspendThread and ResumeThread * w32proc.c (timer_loop): Make sure SuspendThread and ResumeThread
...@@ -28,16 +32,16 @@ ...@@ -28,16 +32,16 @@
* window.c (Fsplit_window_internal): Set combination limit of * window.c (Fsplit_window_internal): Set combination limit of
new parent window to t iff Vwindow_combination_limit is t; new parent window to t iff Vwindow_combination_limit is t;
fixing a regression introduced with the change from 2012-09-22. fixing a regression introduced with the change from 2012-09-22.
(Fwindow_combination_limit, Fset_window_combination_limit): Fix (Fwindow_combination_limit, Fset_window_combination_limit):
doc-strings. Fix doc-strings.
2012-11-06 Eli Zaretskii <eliz@gnu.org> 2012-11-06 Eli Zaretskii <eliz@gnu.org>
* xdisp.c (try_scrolling): Fix correction of aggressive-scroll * xdisp.c (try_scrolling): Fix correction of aggressive-scroll
amount when the scroll margins are too large. When scrolling amount when the scroll margins are too large. When scrolling
backwards in the buffer, give up if cannot reach point or the backwards in the buffer, give up if cannot reach point or the
scroll margin within a reasonable number of screen lines. Fixes scroll margin within a reasonable number of screen lines.
point position in window under scroll-up/down-aggressively when Fixes point position in window under scroll-up/down-aggressively when
point is positioned many lines beyond the window top/bottom. point is positioned many lines beyond the window top/bottom.
(Bug#12811) (Bug#12811)
...@@ -118,8 +122,8 @@ ...@@ -118,8 +122,8 @@
2012-10-29 Daniel Colascione <dancol@dancol.org> 2012-10-29 Daniel Colascione <dancol@dancol.org>
* cygw32.h, cygw32.c (Qutf_16le, from_unicode, to_unicode): In * cygw32.h, cygw32.c (Qutf_16le, from_unicode, to_unicode):
preparation for fixing bug#12739, move these functions from In preparation for fixing bug#12739, move these functions from
here... here...
* coding.h, coding.c: ... to here, and compile them only when * coding.h, coding.c: ... to here, and compile them only when
......
...@@ -508,7 +508,7 @@ spec that specifies non-nil unconditionally (such as \"p\"); or (ii) ...@@ -508,7 +508,7 @@ spec that specifies non-nil unconditionally (such as \"p\"); or (ii)
use `called-interactively-p'. */) use `called-interactively-p'. */)
(void) (void)
{ {
return interactive_p () ? Qt : Qnil; return (INTERACTIVE && interactive_p ()) ? Qt : Qnil;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment