Merge from emacs-24; up to 2014-07-21T01:34:03Z!monnier@iro.umontreal.ca

2 files changed, 5 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3a88ac6b37a..039387ed4af 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-05  Leo Liu  <sdl.web@gmail.com>
+
+        * imenu.el (imenu-default-goto-function): Fix typo.
+
 2014-10-04  Thomas Fitzsimmons  <fitzsim@fitzsim.org>
 
         * net/ntlm.el (ntlm-build-auth-request):
diff --git a/lisp/imenu.el b/lisp/imenu.el
index e5f33a5efb9..3159b6cc563 100644
--- a/lisp/imenu.el
+++ b/lisp/imenu.el
@@ -1012,7 +1012,7 @@ to `imenu-update-menubar'.")
     (imenu item)
     nil))
 
-(defun imenu-default-goto-function (_name position &optional _rest)
+(defun imenu-default-goto-function (_name position &rest _rest)
   "Move to the given position.
 
 NAME is ignored.  POSITION is where to move.  REST is also ignored.