[Emacs-diffs] /srv/bzr/emacs/trunk r104247: * lisp/info-look.el (makefile-automake-mode): New setups, looking in

[Stefan Monnier]

------------------------------------------------------------
revno: 104247
author: Kevin Ryde <address@hidden>
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Mon 2011-05-16 14:41:03 -0300
message:
  * 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.
modified:
  lisp/ChangeLog
  lisp/info-look.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-05-15 14:09:43 +0000
+++ b/lisp/ChangeLog    2011-05-16 17:41:03 +0000
@@ -1,3 +1,14 @@
+2011-05-16  Kevin Ryde  <address@hidden>
+
+       * 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  <address@hidden>
 
        * vc/diff-mode.el (diff-fixup-modifs): Locate correct position for

=== modified file 'lisp/info-look.el'
--- a/lisp/info-look.el 2011-01-25 04:08:28 +0000
+++ b/lisp/info-look.el 2011-05-16 17:41:03 +0000
@@ -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