2 files changed, 19 insertions, 16 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")