[Emacs-diffs] trunk r114845: * src/eval.c (run_hook_with_args): Use FUNCTIONP.

[Stefan Monnier]

------------------------------------------------------------
revno: 114845
revision-id: address@hidden
parent: address@hidden
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Tue 2013-10-29 10:46:23 -0400
message:
  * src/eval.c (run_hook_with_args): Use FUNCTIONP.
  * test/indent/css-mode.css (.x2): Test alignement inside braces.
  * test/indent/prolog.prolog: Test alignment of ->; with operator at bol.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/buffer.c                   buffer.c-20091113204419-o5vbwnq5f7feedwu-264
  src/eval.c                     eval.c-20091113204419-o5vbwnq5f7feedwu-237
  test/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-8588
  test/indent/css-mode.css       cssmode.css-20131004214415-leh4zls88xu60yhv-1
  test/indent/prolog.prolog      prolog.prolog-20100602200639-wynurqxt8ciwxa0t-2
  test/indent/shell.sh           shell.sh-20110209185043-iuyrh0is1gz0s4w6-1

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-10-29 05:55:25 +0000
+++ b/src/ChangeLog     2013-10-29 14:46:23 +0000
@@ -1,3 +1,7 @@
+2013-10-29  Stefan Monnier  <address@hidden>
+
+       * eval.c (run_hook_with_args): Use FUNCTIONP.
+
 2013-10-29  Dmitry Antipov  <address@hidden>
 
        * xterm.h (struct x_output): For 'black_relief' and 'white_relief'
@@ -227,8 +231,8 @@
        (get_adapters_info): New wrapper function.
        (globals_of_w32): Initialize g_b_init_get_adapters_info.
 
-       * process.h (network_interface_list, network_interface_info): New
-       prototypes.
+       * process.h (network_interface_list, network_interface_info):
+       New prototypes.
 
        * process.c (conv_sockaddr_to_lisp): Now externally-visible.
        (Fnetwork_interface_list, Fnetwork_interface_info): Define for
@@ -559,8 +563,8 @@
        (xw_popup_dialog): New function, with X-specific bits of popup
        dialogs.
 
-       * xdisp.c (deep_copy_glyph_row, display_tty_menu_item): New
-       functions.
+       * xdisp.c (deep_copy_glyph_row, display_tty_menu_item):
+       New functions.
 
        * window.c (Fset_window_configuration): Use run-time tests of the
        frame type instead of compile-time conditionals, when menu-bar
@@ -625,11 +629,11 @@
        of, or in addition to, compile-time conditionals.
        (menu_item_width, Fmenu_bar_menu_at_x_y): New functions.
        (Fx_popup_menu): Detect when the function is called from keyboard
-       on a TTY.  Don't barf when invoked on a text-mode frame.  Check
-       frame type at run time, instead of compile-time conditionals for
-       invoking terminal-specific menu-show functions.  Call
-       tty_menu_show on text-mode frames.
-       (Fx_popup_dialog): Moved here from xmenu.c.  Test frame types at
+       on a TTY.  Don't barf when invoked on a text-mode frame.
+       Check frame type at run time, instead of compile-time conditionals for
+       invoking terminal-specific menu-show functions.
+       Call tty_menu_show on text-mode frames.
+       (Fx_popup_dialog): Move here from xmenu.c.  Test frame types at
        run time to determine which alternative to invoke; support dialogs
        on TTYs.
 

=== modified file 'src/buffer.c'
--- a/src/buffer.c      2013-10-15 12:47:57 +0000
+++ b/src/buffer.c      2013-10-29 14:46:23 +0000
@@ -2074,7 +2074,7 @@
   count = SPECPDL_INDEX ();
 
   /* To select a nonfundamental mode,
-     select the buffer temporarily and then call the mode function. */
+     select the buffer temporarily and then call the mode function.  */
 
   record_unwind_protect (save_excursion_restore, save_excursion_save ());
 
@@ -2114,7 +2114,7 @@
 
   old_buf = current_buffer;
   current_buffer = b;
-  last_known_column_point = -1;   /* invalidate indentation cache */
+  last_known_column_point = -1;   /* Invalidate indentation cache.  */
 
   if (old_buf)
     {
@@ -2138,7 +2138,7 @@
   fetch_buffer_markers (b);
 
   /* Look down buffer's list of local Lisp variables
-     to find and update any that forward into C variables. */
+     to find and update any that forward into C variables.  */
 
   do
     {

=== modified file 'src/eval.c'
--- a/src/eval.c        2013-10-09 17:17:20 +0000
+++ b/src/eval.c        2013-10-29 14:46:23 +0000
@@ -2479,7 +2479,7 @@
 
   if (EQ (val, Qunbound) || NILP (val))
     return ret;
-  else if (!CONSP (val) || EQ (XCAR (val), Qlambda))
+  else if (!CONSP (val) || FUNCTIONP (val))
     {
       args[0] = val;
       return funcall (nargs, args);

=== modified file 'test/ChangeLog'
--- a/test/ChangeLog    2013-10-26 01:22:50 +0000
+++ b/test/ChangeLog    2013-10-29 14:46:23 +0000
@@ -1,9 +1,15 @@
+2013-10-29  Stefan Monnier  <address@hidden>
+
+       * indent/prolog.prolog: Test alignment of ->; with operator at bol.
+
+       * indent/css-mode.css (.x2): Test alignement inside braces.
+
 2013-10-26  Dmitry Gutov  <address@hidden>
 
        * indent/ruby.rb: New failing example.
 
-       * automated/ruby-mode-tests.el (ruby-toggle-block-to-brace): Fix
-       the test, in respect to adding the space after the curly.
+       * automated/ruby-mode-tests.el (ruby-toggle-block-to-brace):
+       Fix the test, in respect to adding the space after the curly.
 
 2013-10-24  Michael Albinus  <address@hidden>
 
@@ -45,8 +51,8 @@
 
 2013-10-21  Dmitry Gutov  <address@hidden>
 
-       * indent/ruby.rb: New examples for indentation of blocks.  Example
-       of hash inside parens that inflooped before the present commit.
+       * indent/ruby.rb: New examples for indentation of blocks.
+       Example of hash inside parens that inflooped before the present commit.
 
 2013-10-17  Barry O'Reilly  <address@hidden>
 

=== modified file 'test/indent/css-mode.css'
--- a/test/indent/css-mode.css  2013-10-07 15:40:24 +0000
+++ b/test/indent/css-mode.css  2013-10-29 14:46:23 +0000
@@ -4,6 +4,8 @@
 
 .x2
 {
+    foo: bar;
+    bar: baz;
 }
 
 div.x3

=== modified file 'test/indent/prolog.prolog'
--- a/test/indent/prolog.prolog 2011-12-19 06:21:24 +0000
+++ b/test/indent/prolog.prolog 2013-10-29 14:46:23 +0000
@@ -48,7 +48,19 @@
           subst(Y, Y1, [], Bi, Bi1);
       Y1 = Y, Bi1 = Bi),
      %% Perform substitution on the body.
-     subst(X, V, FV, Bi1, Bo)).
+     subst(X, V, FV, Bi1, Bo)),
+    (  X = Y
+     %% If X is equal to Y, X is shadowed, so no subst can take place.
+     ->        Y1 = Y, Bo = Bi
+     ; (member((Y, _), FV)
+        %% If Y appears in FV, it can appear in V, so we need to
+        %% rename it to avoid name capture.
+        -> new_atom(Y, Y1),
+           subst(Y, Y1, [], Bi, Bi1)
+        ; Y1 = Y, Bi1 = Bi),
+       %% Perform substitution on the body.
+       subst(X, V, FV, Bi1, Bo)
+    ).
 subst(X, V, FV, pi(Y, Ti, Bi), pi(Y1, To, Bo)) :-
     subst(X, V, FV, lambda(Y, Ti, Bi), lambda(Y1, To, Bo)).
 subst(X, V, FV, forall(Y, Ti, Bi), forall(Y1, To, Bo)) :-

=== modified file 'test/indent/shell.sh'
--- a/test/indent/shell.sh      2013-10-17 03:56:51 +0000
+++ b/test/indent/shell.sh      2013-10-29 14:46:23 +0000
@@ -35,7 +35,7 @@
 declare -a VERSION
 for i in $(ls "$PREFIX/sbin") ; do
     echo -e $N')' $i
-    VERSION[${#VERSION[*]}]=$i         #bug#11946.
+    VERSION[${#VERSION[*]}]=$i  # bug#11946.
     N=$(($N + 1))
 done