aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2010-10-31 22:48:20 -0700
committerGlenn Morris2010-10-31 22:48:20 -0700
commit28886d5eaaf0c91a4507b95edf23317ed4c6fa90 (patch)
tree0f7ddae78fd60ee0a7e858f2aefc4fb7ab6ee3bc
parent87732ef36ad03013efe8a6a29bdf9389f0abade3 (diff)
downloademacs-28886d5eaaf0c91a4507b95edf23317ed4c6fa90.tar.gz
emacs-28886d5eaaf0c91a4507b95edf23317ed4c6fa90.zip
* lisp/info.el (finder-keywords-hash, package-alist): Declare.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/info.el9
2 files changed, 9 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 74bcfff9266..2d508987c6b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12010-11-01 Glenn Morris <rgm@gnu.org>
2
3 * info.el (finder-keywords-hash, package-alist): Declare.
4
12010-11-01 Chong Yidong <cyd@stupidchicken.com> 52010-11-01 Chong Yidong <cyd@stupidchicken.com>
2 6
3 * finder.el (finder-compile-keywords): Don't use intern-soft, 7 * finder.el (finder-compile-keywords): Don't use intern-soft,
diff --git a/lisp/info.el b/lisp/info.el
index 9b0e87b3c25..163ca258159 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -1,8 +1,8 @@
1;; info.el --- info package for Emacs 1;; info.el --- info package for Emacs
2 2
3;; Copyright (C) 1985, 1986, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 3;; Copyright (C) 1985, 1986, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
4;; 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 4;; 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
5;; Free Software Foundation, Inc. 5;; 2010 Free Software Foundation, Inc.
6 6
7;; Maintainer: FSF 7;; Maintainer: FSF
8;; Keywords: help 8;; Keywords: help
@@ -3379,6 +3379,8 @@ Build a menu of the possible matches."
3379(declare-function find-library-name "find-func" (library)) 3379(declare-function find-library-name "find-func" (library))
3380(declare-function finder-unknown-keywords "finder" ()) 3380(declare-function finder-unknown-keywords "finder" ())
3381(declare-function lm-commentary "lisp-mnt" (&optional file)) 3381(declare-function lm-commentary "lisp-mnt" (&optional file))
3382(defvar finder-keywords-hash)
3383(defvar package-alist) ; finder requires package
3382 3384
3383(defun Info-finder-find-node (filename nodename &optional no-going-back) 3385(defun Info-finder-find-node (filename nodename &optional no-going-back)
3384 "Finder-specific implementation of Info-find-node-2." 3386 "Finder-specific implementation of Info-find-node-2."
@@ -4930,5 +4932,4 @@ type returned by `Info-bookmark-make-record', which see."
4930 4932
4931(provide 'info) 4933(provide 'info)
4932 4934
4933;; arch-tag: f2480fe2-2139-40c1-a49b-6314991164ac
4934;;; info.el ends here 4935;;; info.el ends here