Support current auto{conf,make} manuals.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c63da8750c3a58cdcbe6b491a7117cc5ab4e9a50..bb8284e2d595e74885ca8e9433dfc7a8178828f3 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2002-07-18  Dave Love  <fx@gnu.org>
+
+       * info-look.el: Support current auto{conf,make} manuals.
+
 2002-07-18  Juanma Barranquero  <lektu@terra.es>
 
        * bindings.el (last-buffer): Add missing frame argument.
@@ -586,21 +590,6 @@
        inheriting from the mode-line face, since we can't override it,
        and we don't want it for ttys.
 
-2002-07-02  Dave Love  <fx@gnu.org>
-
-       * international/characters.el: Fix general punctuation cases.
-       Remove \e$,1uf\e(B case.
-
-       * international/ccl.el (ccl-command-table): Add lookup-character,
-       lookup-integer.
-       (ccl-extended-code-table): Add lookup-int-const-tbl,
-       lookup-char-const-tbl.
-       (ccl-compile-lookup-integer, ccl-compile-lookup-character): New
-       function.
-
-       * international/mule.el (define-translation-hash-table): New
-       function.
-
 2002-07-02  Richard M. Stallman  <rms@gnu.org>
 
        * net/ange-ftp.el (ange-ftp-hook-function): Add file-remote-p prop.

diff --git a/lisp/info-look.el b/lisp/info-look.el
index ec5e779d36a5f8036689c7f2439909fb43a86726..920a9afc9779fdf0f83dfbf2b92b05e6d26d7a64 100644 (file)
--- a/lisp/info-look.el
+++ b/lisp/info-look.el
@@ -56,8 +56,7 @@ Setting this variable to nil disables highlighting."
   "Overlay object used for highlighting.")
 
 (defcustom info-lookup-file-name-alist
-  '(("\\`configure\\.in\\'" . autoconf-mode) ;already covered by auto-mode-alist
-    ("\\`ac\\(local\\|site\\|include\\)\\.m4\\'" . autoconf-mode))
+  '(("\\`ac\\(local\\|site\\|include\\)\\.m4\\'" . autoconf-mode))
   "Alist of file names handled specially.
 List elements are cons cells of the form
 
@@ -672,7 +671,12 @@ Return nil if there is nothing appropriate in the buffer near point."
 (info-lookup-maybe-add-help
  :mode 'autoconf-mode
  :regexp "A[CM]_[_A-Z0-9]+"
- :doc-spec '(("(autoconf)Macro Index" "AC_"
+ :doc-spec '(("(autoconf)Autoconf Macro Index" "AC_"
+             "^[ \t]+- \\(Macro\\|Variable\\): .*\\<" "\\>")
+            ("(automake)Macro and Variable Index" nil
+             "^[ \t]*`" "'")
+            ;; These are for older versions (probably pre autoconf 2.5x):
+            ("(autoconf)Macro Index" "AC_"
              "^[ \t]+- \\(Macro\\|Variable\\): .*\\<" "\\>")
             ("(automake)Macro and Variable Index" nil
              "^[ \t]*`" "'"))