From 3bfacb2fee4c762b7b8e22ae3728607708c9d206 Mon Sep 17 00:00:00 2001 From: Kevin Ryde Date: Mon, 16 May 2011 14:41:03 -0300 Subject: [PATCH] * 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. --- lisp/ChangeLog | 11 +++++++++++ lisp/info-look.el | 28 ++++++++++++++++++++++++---- 2 files changed, 35 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2e0e7f99e56..05a2ceefdf4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,14 @@ +2011-05-16 Kevin Ryde + + * 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 * vc/diff-mode.el (diff-fixup-modifs): Locate correct position for diff --git a/lisp/info-look.el b/lisp/info-look.el index 6baed1c422d..5e51fcc9b9d 100644 --- a/lisp/info-look.el +++ b/lisp/info-look.el @@ -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 -- 2.39.2