2 files changed, 8 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ec3eacfbc38..704efea7135 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-07  Juanma Barranquero  <lekktu@gmail.com>
+
+        * progmodes/which-func.el (which-func-mode): Turn into a
+        non-interactive function and mark as obsolete (bug#10428).
+
 2012-01-06  Chong Yidong  <cyd@gnu.org>
 
         * files.el (hack-dir-local-variables-non-file-buffer): Add doc.
diff --git a/lisp/progmodes/which-func.el b/lisp/progmodes/which-func.el
index 59933a944d5..721c610517a 100644
--- a/lisp/progmodes/which-func.el
+++ b/lisp/progmodes/which-func.el
@@ -229,7 +229,9 @@ It creates the Imenu index for the buffer, if necessary."
          (error "Error in which-func-update: %S" info))))))
 
 ;;;###autoload
-(defalias 'which-func-mode 'which-function-mode)
+(defun which-func-mode (&optional arg)
+  (which-function-mode arg))
+(make-obsolete 'which-func-mode 'which-function-mode "24.1")
 
 (defvar which-func-update-timer nil)