[Emacs-diffs] master 9a83497 9/9: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

[Paul Eggert]

branch: master
commit 9a834970e822db10bc887db343fd8561a3639a66
Merge: 6ca3667 01d70ef
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
---
 lisp/info.el         |    2 +-
 lisp/progmodes/js.el |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/info.el b/lisp/info.el
index 5a1cec1..70d218f 100644
--- 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 a35c4a3..40f60c9 100644
--- 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