* info-look.el (sh-mode): Look for coreutils new "Concept Index"

node.  Keep previous "Index" name to work with past coreutils too.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5783c2118122701f01f781d95456864af632f4ac..a2710d59b7e5513a45bbf67a2ab93813f256ab62 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-26  Kevin Ryde  <user42@zip.com.au>
+
+       * info-look.el (sh-mode): Look for coreutils new "Concept Index"
+       node.  Keep previous "Index" name to work with past coreutils too.
+
 2009-12-26  Michael Albinus  <michael.albinus@gmx.de>
 
        * net/tramp.el (tramp-handle-insert-directory): Quote "'" in the

diff --git a/lisp/info-look.el b/lisp/info-look.el
index 7c9c124eb395c09d8a25e252b3f05e877605def6..12169f6f107a9979b4de74d816ef72ca2b2a21b2 100644 (file)
--- a/lisp/info-look.el
+++ b/lisp/info-look.el
@@ -936,11 +936,18 @@ Return nil if there is nothing appropriate in the buffer near point."
  :doc-spec '(("(bash)Builtin Index"       nil "^`" "[ .']")
              ("(bash)Reserved Word Index" nil "^`" "[ .']")
              ("(bash)Variable Index"      nil "^`" "[ .']")
+
              ;; coreutils (version 4.5.10) doesn't have a separate program
              ;; index, so exclude extraneous stuff (most of it) by demanding
              ;; "[a-z]+" in the trans-func.
+             ;; coreutils version 8.1 has node "Concept Index" and past
+             ;; versions have node "Index", look for both, whichever is
+             ;; absent is quietly ignored
              ("(coreutils)Index"
               (lambda (item) (if (string-match "\\`[a-z]+\\'" item) item)))
+             ("(coreutils)Concept Index"
+              (lambda (item) (if (string-match "\\`[a-z]+\\'" item) item)))
+
              ;; diff (version 2.8.1) has only a few programs, index entries
              ;; are things like "foo invocation".
              ("(diff)Index"