[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#8660: 23.2; info-look.el makefile-mode derivatives
From: |
Kevin Ryde |
Subject: |
bug#8660: 23.2; info-look.el makefile-mode derivatives |
Date: |
Mon, 16 May 2011 10:02:13 +1000 |
User-agent: |
Gnus/5.110011 (No Gnus v0.11) Emacs/23.2 (gnu/linux) |
Stefan Monnier <monnier@iro.umontreal.ca> writes:
>
> inferior-octave-mode uses it.
I saw that, in `octave-help', but presumed it was to make that command
independent of the major mode, ie. since the command is "octave-help" it
should always consult the octave docs.
> Oh, yes, that would be a better change. Patch welcome.
Would you like to take the automakery bit first and I'll see what I can
get to for the derived,
2011-05-15 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.
--- info-look.el.orig 2011-05-12 08:36:49.000000000 +1000
+++ info-look.el 2011-05-16 09:53:41.000000000 +1000
@@ -720,11 +720,31 @@
: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
--
At Sydney airport Australian passport holders may be asked to verify
their citizenship by singing the national anthem. It's a trick. Anyone
who knows more than the first two lines is an imposter. If you get to
"girt by sea" and know what that means then expect a trip to Villawood.