4 files changed, 48 insertions, 46 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5911f134488..cf5ccd24e54 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,10 +1,13 @@
+2015-02-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * subr.el (indirect-function): Change advertised calling convention.
+
 2015-02-08  Fabián Ezequiel Gallina  <fgallina@gnu.org>
 
         python.el: Fix completion-at-point.  (Bug#19667)
 
         * progmodes/python.el
-        (python-shell-completion-native-get-completions): Force process
-        buffer.
+        (python-shell-completion-native-get-completions): Force process buffer.
         (python-shell-completion-at-point): Handle case where call is not
         in a shell buffer.
 
@@ -13,17 +16,16 @@
         python.el: Fix shell font-lock multiline input.  (Bug#19744)
 
         * progmodes/python.el
-        (python-shell-font-lock-post-command-hook): Handle multiline
-        input.
+        (python-shell-font-lock-post-command-hook): Handle multiline input.
 
 2015-02-08  Fabián Ezequiel Gallina  <fgallina@gnu.org>
 
         python.el: Make shell font-lock respect markers.  (Bug#19650)
 
-        * progmodes/python.el (python-shell-font-lock-cleanup-buffer): Use
-        `erase-buffer`.
-        (python-shell-font-lock-comint-output-filter-function): Handle
-        newlines.
+        * progmodes/python.el (python-shell-font-lock-cleanup-buffer):
+        Use `erase-buffer`.
+        (python-shell-font-lock-comint-output-filter-function):
+        Handle newlines.
         (python-shell-font-lock-post-command-hook): Respect markers on
         text fontification.
 
@@ -31,8 +33,8 @@
 
         python.el: Keep eldoc visible while typing args.  (Bug#19637)
 
-        * progmodes/python.el (python-eldoc--get-symbol-at-point): New
-        function based on Carlos Pita <carlosjosepita@gmail.com> patch.
+        * progmodes/python.el (python-eldoc--get-symbol-at-point):
+        New function based on Carlos Pita <carlosjosepita@gmail.com> patch.
         (python-eldoc--get-doc-at-point, python-eldoc-at-point): Use it.
 
 2015-02-07  Fabián Ezequiel Gallina  <fgallina@gnu.org>
@@ -52,10 +54,10 @@
 
 2015-02-07  Martin Rudalics  <rudalics@gmx.at>
 
-        * frame.el (frame-notice-user-settings): Update
-        `frame-size-history'.
-        (make-frame): Update `frame-size-history'.  Call
-        `frame-after-make-frame'.
+        * frame.el (frame-notice-user-settings):
+        Update `frame-size-history'.
+        (make-frame): Update `frame-size-history'.
+        Call `frame-after-make-frame'.
         * faces.el (face-set-after-frame-default): Remove call to
         frame-can-run-window-configuration-change-hook.
 
@@ -91,8 +93,8 @@
 
 2015-02-05  Artur Malabarba  <bruce.connor.am@gmail.com>
 
-        * emacs-lisp/package.el (package--sort-by-dependence): New
-        function.  Return PACKAGE-LIST sorted by dependencies.
+        * emacs-lisp/package.el (package--sort-by-dependence):
+        New function.  Return PACKAGE-LIST sorted by dependencies.
         (package-menu-execute): Use it to delete packages in order.
         (package--sort-deps-in-alist): New function.
         (package-menu-mark-install): Can mark dependencies.
diff --git a/lisp/subr.el b/lisp/subr.el
index 3b27b33d960..0dfb8ed2a51 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1274,6 +1274,7 @@ is converted into a string by expressing it in decimal."
 (set-advertised-calling-convention
  'all-completions '(string collection &optional predicate) "23.1")
 (set-advertised-calling-convention 'unintern '(name obarray) "23.3")
+(set-advertised-calling-convention 'indirect-function '(object) "25.1")
 (set-advertised-calling-convention 'redirect-frame-focus '(frame focus-frame) "24.3")
 (set-advertised-calling-convention 'decode-char '(ch charset) "21.4")
 (set-advertised-calling-convention 'encode-char '(ch charset) "21.4")
diff --git a/src/ChangeLog b/src/ChangeLog
index ec70cdb93a9..f544f197a9b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,19 +1,24 @@
+2015-02-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * data.c (Findirect_function): Like `symbol-function', don't signal an
+        error for void functions any more.
+
 2015-02-07  Martin Rudalics  <rudalics@gmx.at>
 
         * frame.c (frame_size_history_add): New function.
         (frame_inhibit_resize): Consider frame_inhibit_implied_resize
-        only after frame's after_make_frame slot is true.  Inhibit
-        resizing fullwidth-/height frames in one direction only.  Update
-        frame_size_history.
+        only after frame's after_make_frame slot is true.
+        Inhibit resizing fullwidth-/height frames in one direction only.
+        Update frame_size_history.
         (adjust_frame_size): Call frame_size_history_add.
         (make_frame): Initalize after_make_frame slot.
         (Fmake_terminal_frame): Adjust adjust_frame_size call.
         (Fcan_run_window_configuration_change_hook): Rename to
-        Fframe_after_make_frame.  Set after_make_frame slot.  Return
-        second argument.
+        Fframe_after_make_frame.  Set after_make_frame slot.
+        Return second argument.
         (x_set_frame_parameters): Postpone handling fullscreen parameter
-        until after width and height parameters have been set.  Apply
-        width and height changes only if can_x_set_window_size is true.
+        until after width and height parameters have been set.
+        Apply width and height changes only if can_x_set_window_size is true.
         Update frame_size_history.
         (Qadjust_frame_size_1, Qadjust_frame_size_2)
         (Qadjust_frame_size_3, QEmacsFrameResize, Qframe_inhibit_resize)
@@ -22,12 +27,11 @@
         (Qxg_frame_set_char_size_2, Qxg_frame_set_char_size_3)
         (Qxg_change_toolbar_position, Qx_net_wm_state)
         (Qx_handle_net_wm_state, Qtb_size_cb, Qupdate_frame_tool_bar)
-        (Qfree_frame_tool_bar): New symbol for updating
-        frame_size_history.
+        (Qfree_frame_tool_bar): New symbol for updating frame_size_history.
         (Qtip_frame, Qterminal_frame): New symbols.
         (Vframe_adjust_size_history): Rename to frame_size_history.
-        * frame.h (struct frame): Rename
-        can_run_window_configuration_change_hook slot to
+        * frame.h (struct frame):
+        Rename can_run_window_configuration_change_hook slot to
         after_make_frame.
         (frame_size_history_add): Extern.
         * gtkutil.c (xg_frame_resized): Call frame_size_history_add.
@@ -52,21 +56,21 @@
         (x_set_window_size): Try to handle fullwidth and fullheight more
         accurately.  Don't rely on w32_enable_frame_resize_hack.
         (w32_enable_frame_resize_hack): Remove variable.
-        * widget.c (EmacsFrameResize): Remove dead code.  Call
-        frame_size_history_add
-        * window.c (run_window_configuration_change_hook): Check
-        f->after_make_frame instead of
+        * widget.c (EmacsFrameResize): Remove dead code.
+        Call frame_size_history_add
+        * window.c (run_window_configuration_change_hook):
+        Check f->after_make_frame instead of
         f->can_run_window_configuration_change_hook.
         * xfns.c (x_change_tool_bar_height): Handle frame's fullscreen status.
         (Fx_create_frame): Process fullscreen parameter after frame has
         been resized.
         (Fx_frame_geometry): Don't pollute pure storage.
-        * xterm.c (x_net_wm_state, x_handle_net_wm_state): Call
-        frame_size_history_add.
+        * xterm.c (x_net_wm_state, x_handle_net_wm_state):
+        Call frame_size_history_add.
         (do_ewmh_fullscreen): Handle x_frame_normalize_before_maximize.
         (x_check_fullscreen): Count in menubar when calling
-        XResizeWindow.  Wait for ConfigureNotify event.  Call
-        frame_size_history_add.
+        XResizeWindow.  Wait for ConfigureNotify event.
+        Call frame_size_history_add.
         (x_set_window_size_1): Remove PIXELWISE argument.  Try to handle
         changing a fullheight frame's width or a fullwidth frame's
         height.  Call frame_size_history_add.
@@ -319,8 +323,8 @@
         (x_horizontal_scroll_bar_report_motion, w32_read_socket)
         (w32_set_vertical_scroll_bar, w32_set_horizontal_scroll_bar)
         (w32_draw_window_cursor, x_new_font, x_set_offset)
-        (x_set_window_size, x_make_frame_invisible, x_iconify_frame): Use
-        bool where appropriate.
+        (x_set_window_size, x_make_frame_invisible, x_iconify_frame):
+        Use bool where appropriate.
 
         Use bool for boolean in w32fns.c
         * w32fns.c (w32_defined_color, x_decode_color)
@@ -789,8 +793,8 @@
         Qx_create_frame_2 to adjust_frame_size.
         * w32menu.c (set_frame_menubar): Simplify adjust_frame_size
         call.
-        * window.c (Fset_window_configuration): Pass
-        Qset_window_configuration to adjust_frame_size.
+        * window.c (Fset_window_configuration):
+        Pass Qset_window_configuration to adjust_frame_size.
         * xdisp.c (redisplay_tool_bar): Assign new height to
         frame_default_tool_bar_height.
         (redisplay_internal): If we haven't redisplayed this frame's
@@ -858,8 +862,8 @@
 
         * w32fns.c (Fw32_register_hot_key): Use XINT instead of XLI.
 
-        * w32notify.c (Fw32notify_add_watch, w32_get_watch_object): Use
-        make_pointer_integer instead of XIL.
+        * w32notify.c (Fw32notify_add_watch, w32_get_watch_object):
+        Use make_pointer_integer instead of XIL.
         (Fw32notify_rm_watch): Use XINTPTR instead of XLI.
 
         * w32inevt.c (handle_file_notifications): Use make_pointer_integer
diff --git a/src/data.c b/src/data.c
index d06b9916b3a..47706584f5e 100644
--- a/src/data.c
+++ b/src/data.c
@@ -2125,8 +2125,6 @@ DEFUN ("indirect-function", Findirect_function, Sindirect_function, 1, 2, 0,
        doc: /* Return the function at the end of OBJECT's function chain.
 If OBJECT is not a symbol, just return it.  Otherwise, follow all
 function indirections to find the final function binding and return it.
-If the final symbol in the chain is unbound, signal a void-function error.
-Optional arg NOERROR non-nil means to return nil instead of signaling.
 Signal a cyclic-function-indirection error if there is a loop in the
 function chain of symbols.  */)
   (register Lisp_Object object, Lisp_Object noerror)
@@ -2141,9 +2139,6 @@ function chain of symbols.  */)
   if (!NILP (result))
     return result;
 
-  if (NILP (noerror))
-    xsignal1 (Qvoid_function, object);
-
   return Qnil;
 }