Commit 3bfacb2f authored by Kevin Ryde's avatar Kevin Ryde Committed by Stefan Monnier
Browse files

* lisp/info-look.el (makefile-automake-mode): New setups, looking in

automake manual, then makefile-mode.
(makefile-mode): Remove automake manual, have it just in
makefile-automake-mode since there's various things different or
not relevant to plain make.
(makefile-mode): Remove "other-modes" non-existent automake-mode,
believe a hypothetical automake-mode would go to makefile-mode,
not the other way around.
parent 7887e229
2011-05-16 Kevin Ryde <user42@zip.com.au>
* info-look.el (makefile-automake-mode): New setups, looking in
automake manual, then makefile-mode.
(makefile-mode): Remove automake manual, have it just in
makefile-automake-mode since there's various things different or
not relevant to plain make.
(makefile-mode): Remove "other-modes" non-existent automake-mode,
believe a hypothetical automake-mode would go to makefile-mode,
not the other way around.
2011-05-15 Chong Yidong <cyd@stupidchicken.com>
* vc/diff-mode.el (diff-fixup-modifs): Locate correct position for
......
......@@ -720,11 +720,31 @@ Return nil if there is nothing appropriate in the buffer near point."
:mode 'makefile-mode
:regexp "\\$[^({]\\|\\.[_A-Z]*\\|[_a-zA-Z][_a-zA-Z0-9-]*"
:doc-spec '(("(make)Name Index" nil
"^[ \t]*`" "'")
("(automake)Macro and Variable Index" nil
"^[ \t]*`" "'"))
:parse-rule "\\$[^({]\\|\\.[_A-Z]*\\|[_a-zA-Z0-9-]+"
:other-modes '(automake-mode))
:parse-rule "\\$[^({]\\|\\.[_A-Z]*\\|[_a-zA-Z0-9-]+")
(info-lookup-maybe-add-help
:topic 'symbol
:mode 'makefile-automake-mode
;; similar regexp/parse-rule as makefile-mode, but also the following
;; (which have index entries),
;; "##" special automake comment
;; "+=" append operator, separate from the GNU make one
:regexp "\\$[^({]\\|\\.[_A-Z]*\\|[_a-zA-Z][_a-zA-Z0-9-]*\\|##\\|\\+="
:parse-rule "\\$[^({]\\|\\.[_A-Z]*\\|[_a-zA-Z0-9-]+\\|##\\|\\+="
:doc-spec '(
;; "(automake)Macro Index" is autoconf macros used in
;; configure.in, not Makefile.am, so don't have that here.
("(automake)Variable Index" nil "^[ \t]*`" "'")
;; In automake 1.4 macros and variables were a combined node.
("(automake)Macro and Variable Index" nil "^[ \t]*`" "'")
;; Directives like "if" are in the "General Index".
;; Prefix "`" since the text for say `+=' isn't always an
;; @item etc and so not always at the start of a line.
("(automake)General Index" nil "`" "'")
;; In automake 1.3 there was just a single "Index" node.
("(automake)Index" nil "`" "'"))
:other-modes '(makefile-mode))
(info-lookup-maybe-add-help
:mode 'texinfo-mode
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment