upstream

1 files changed, 48 insertions, 6 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 2a0c0e6822d..332656fcf00 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,45 @@
+2012-11-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        Conflate Qnil and Qunbound for `symbol-function'.
+        * alloc.c (Fmake_symbol): Initialize `function' to Qnil.
+        * lread.c (init_obarray): Set `function' fields to Qnil.
+        * eval.c (Fcommandp): Ignore Qunbound.
+        (Fautoload, eval_sub, Fapply, Ffuncall, Fmacroexpand):
+        * data.c (Ffset, Ffboundp, indirect_function, Findirect_function):
+        Test NILP rather than Qunbound.
+        (Ffmakunbound): Set to Qnil.
+        (Fsymbol_function): Never signal an error.
+        (Finteractive_form): Ignore Qunbound.
+
+2012-11-20  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * eval.c (interactive_p): Remove no-longer-used decl.
+
+2012-11-20  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * xdisp.c (buffer_shared): Adjust comment.
+        (buffer_shared_and_changed): New function.
+        (prepare_menu_bars, redisplay_internal): Use it to
+        decide whether all windows or frames should be updated.
+        (window_outdated): New function.
+        (text_outside_line_unchanged_p, redisplay_window): Use it.
+        (redisplay_internal): Likewise.  Fix indentation.
+
+2012-11-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * eval.c (Finteractive_p, Fcalled_interactively_p, interactive_p): Remove.
+        (syms_of_eval): Remove corresponding defsubr.
+        * bytecode.c (exec_byte_code): `interactive-p' is now a Lisp function.
+
+2012-11-19  Daniel Colascione  <dancol@dancol.org>
+
+        * w32fns.c (Fx_file_dialog):
+        (Fx_file_dialog): Accomodate rename of cygwin_convert_path* to
+        cygwin_convert_file_name*.
+
+        * cygw32.c (Fcygwin_convert_path_to_windows, syms_of_cygw32):
+        Rename cygwin_convert_path* to cygwin_convert_file_name*.
+
 2012-11-18  Paul Eggert  <eggert@cs.ucla.edu>
 
         * nsterm.m (ns_select): Send SIGIO only to self, not to process group.
@@ -8,10 +50,10 @@
         windows.h gets included before w32term.h uses some of its
         features, see below.
 
-        * w32term.h (LOCALE_ENUMPROCA, LOCALE_ENUMPROCW) [_MSC_VER]: New
-        typedefs.
-        (EnumSystemLocalesA, EnumSystemLocalesW) [_MSC_VER]: New
-        prototypes.
+        * w32term.h (LOCALE_ENUMPROCA, LOCALE_ENUMPROCW) [_MSC_VER]:
+        New typedefs.
+        (EnumSystemLocalesA, EnumSystemLocalesW) [_MSC_VER]:
+        New prototypes.
         (EnumSystemLocales) [_MSC_VER]: Define if undefined.  (Bug#12878)
 
 2012-11-18  Jan Djärv  <jan.h.d@swipnet.se>
@@ -303,8 +345,8 @@
         * xdisp.c (try_scrolling): Fix correction of aggressive-scroll
         amount when the scroll margins are too large.  When scrolling
         backwards in the buffer, give up if cannot reach point or the
-        scroll margin within a reasonable number of screen lines.  Fixes
-        point position in window under scroll-up/down-aggressively when
+        scroll margin within a reasonable number of screen lines.
+        Fixes point position in window under scroll-up/down-aggressively when
         point is positioned many lines beyond the window top/bottom.
         (Bug#12811)