From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Kevin Ryde Newsgroups: gmane.emacs.bugs Subject: bug#8660: 23.2; info-look.el makefile-mode derivatives Date: Mon, 16 May 2011 10:02:13 +1000 Message-ID: <87aaenikca.fsf@blah.blah> References: <87zkmskbtr.fsf@blah.blah> <87y62ajc5b.fsf@blah.blah> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: dough.gmane.org 1305504193 1193 80.91.229.12 (16 May 2011 00:03:13 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 16 May 2011 00:03:13 +0000 (UTC) Cc: 8660@debbugs.gnu.org To: Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon May 16 02:03:08 2011 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([140.186.70.17]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1QLlH8-0005Bx-H5 for geb-bug-gnu-emacs@m.gmane.org; Mon, 16 May 2011 02:03:06 +0200 Original-Received: from localhost ([::1]:57923 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QLlH8-0002eD-3G for geb-bug-gnu-emacs@m.gmane.org; Sun, 15 May 2011 20:03:06 -0400 Original-Received: from eggs.gnu.org ([140.186.70.92]:33562) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QLlH5-0002e7-UW for bug-gnu-emacs@gnu.org; Sun, 15 May 2011 20:03:04 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QLlH4-0001Ms-R2 for bug-gnu-emacs@gnu.org; Sun, 15 May 2011 20:03:03 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:35524) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QLlH4-0001Mi-NU for bug-gnu-emacs@gnu.org; Sun, 15 May 2011 20:03:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.69) (envelope-from ) id 1QLlH4-0004ws-40; Sun, 15 May 2011 20:03:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Kevin Ryde Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 16 May 2011 00:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 8660 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 8660-submit@debbugs.gnu.org id=B8660.130550413618973 (code B ref 8660); Mon, 16 May 2011 00:03:02 +0000 Original-Received: (at 8660) by debbugs.gnu.org; 16 May 2011 00:02:16 +0000 Original-Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1QLlGJ-0004vy-Ow for submit@debbugs.gnu.org; Sun, 15 May 2011 20:02:16 -0400 Original-Received: from mailout2-13.pacific.net.au ([125.255.80.140] helo=mailout2.pacific.net.au) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1QLlGG-0004vh-8z for 8660@debbugs.gnu.org; Sun, 15 May 2011 20:02:14 -0400 Original-Received: from mailproxy1.pacific.net.au (mailproxy1.pacific.net.au [61.8.2.162]) by mailout2.pacific.net.au (Postfix) with ESMTP id E3DF82B9F06; Mon, 16 May 2011 10:02:04 +1000 (EST) Original-Received: from blah.blah (unknown [203.26.175.10]) by mailproxy1.pacific.net.au (Postfix) with ESMTP id EA3D58C05; Mon, 16 May 2011 10:02:03 +1000 (EST) Original-Received: from gg by blah.blah with local (Exim 4.72) (envelope-from ) id 1QLlGH-0003cq-Tt; Mon, 16 May 2011 10:02:14 +1000 In-Reply-To: (Stefan Monnier's message of "Sat, 14 May 2011 00:55:18 -0300") User-Agent: Gnus/5.110011 (No Gnus v0.11) Emacs/23.2 (gnu/linux) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list Resent-Date: Sun, 15 May 2011 20:03:02 -0400 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:46476 Archived-At: --=-=-= Stefan Monnier 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 * 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. --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=info-look.el.makefile-derivatives-2.diff --- 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. --=-=-=--