diff options
| author | Kevin Ryde <user42@zip.com.au> | 2009-12-26 21:14:25 +0000 |
|---|---|---|
| committer | Kevin Ryde <user42@zip.com.au> | 2009-12-26 21:14:25 +0000 |
| commit | 39764e76410ea566484a756350139b83c729eede (patch) | |
| tree | 5f6767b3f7c38d0569257163854e9225069a0c90 | |
| parent | 7f4d4a978d1c7357177494cb8297873f28bd73b1 (diff) | |
| download | emacs-39764e76410ea566484a756350139b83c729eede.tar.gz | |
* info-look.el (sh-mode): Look for coreutils new "Concept Index"
node. Keep previous "Index" name to work with past coreutils too.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/info-look.el | 7 |
2 files changed, 12 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5783c211812..a2710d59b7e 100644 --- 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 7c9c124eb39..12169f6f107 100644 --- 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" |