Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

diff --git a/lisp/info.el b/lisp/info.el
index 5a1cec11dd2dbef405975ec52574c00dfc37d5bc..70d218fbca2333171b7b9fdbd9bed44679e65214 100644 (file)
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -189,7 +189,7 @@ A header-line does not scroll with the rest of the buffer."
               configure-info-directory)))
         (prefixes
          ;; Directory trees in which to look for info subdirectories
-         (prune-directory-list '("/usr/local/" "/usr/" "/opt/" "/")))
+         (prune-directory-list '("/usr/local/" "/usr/" "/opt/")))
         (suffixes
          ;; Subdirectories in each directory tree that may contain info
          ;; directories.

diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index a35c4a31d064b376c0620ed35f124863630951bc..40f60c9277a228518cd77ef9b325317eeec4779e 100644 (file)
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -62,7 +62,7 @@
 (defvar moz-repl-name)
 (defvar ido-cur-list)
 (defvar electric-layout-rules)
-(declare-function ido-mode "ido")
+(declare-function ido-mode "ido" (arg))
 (declare-function inferior-moz-process "ext:mozrepl" ())
 
 ;;; Constants