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: Thu, 12 May 2011 10:21:52 +1000 Message-ID: <87zkmskbtr.fsf@blah.blah> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: dough.gmane.org 1305159793 24257 80.91.229.12 (12 May 2011 00:23:13 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Thu, 12 May 2011 00:23:13 +0000 (UTC) To: 8660@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu May 12 02:23:09 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 1QKJgI-0005bw-Oh for geb-bug-gnu-emacs@m.gmane.org; Thu, 12 May 2011 02:23:07 +0200 Original-Received: from localhost ([::1]:54292 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QKJgH-0007Cm-Vr for geb-bug-gnu-emacs@m.gmane.org; Wed, 11 May 2011 20:23:05 -0400 Original-Received: from eggs.gnu.org ([140.186.70.92]:55881) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QKJgF-0007CZ-J5 for bug-gnu-emacs@gnu.org; Wed, 11 May 2011 20:23:04 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QKJgE-0005QM-JJ for bug-gnu-emacs@gnu.org; Wed, 11 May 2011 20:23:03 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:39222) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QKJgE-0005QI-GQ for bug-gnu-emacs@gnu.org; Wed, 11 May 2011 20:23:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.69) (envelope-from ) id 1QKJgE-0007wF-7m; Wed, 11 May 2011 20:23: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: Thu, 12 May 2011 00:23:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 8660 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.130515972930445 (code B ref -1); Thu, 12 May 2011 00:23:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 12 May 2011 00:22:09 +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 1QKJfM-0007v0-2o for submit@debbugs.gnu.org; Wed, 11 May 2011 20:22:08 -0400 Original-Received: from eggs.gnu.org ([140.186.70.92]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1QKJfJ-0007uW-Cp for submit@debbugs.gnu.org; Wed, 11 May 2011 20:22:06 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QKJfC-0005LF-WC for submit@debbugs.gnu.org; Wed, 11 May 2011 20:22:00 -0400 Original-Received: from lists.gnu.org ([140.186.70.17]:55008) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QKJfC-0005LB-Uc for submit@debbugs.gnu.org; Wed, 11 May 2011 20:21:58 -0400 Original-Received: from eggs.gnu.org ([140.186.70.92]:55668) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QKJfB-0007Bb-Ts for bug-gnu-emacs@gnu.org; Wed, 11 May 2011 20:21:58 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QKJfA-0005Kv-CE for bug-gnu-emacs@gnu.org; Wed, 11 May 2011 20:21:57 -0400 Original-Received: from mailout2-1.pacific.net.au ([61.8.2.224]:60214 helo=mailout2.pacific.net.au) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QKJf9-0005Kb-Q8 for bug-gnu-emacs@gnu.org; Wed, 11 May 2011 20:21:56 -0400 Original-Received: from mailproxy2.pacific.net.au (mailproxy2.pacific.net.au [61.8.2.163]) by mailout2.pacific.net.au (Postfix) with ESMTP id 958C62BB66B for ; Thu, 12 May 2011 10:21:51 +1000 (EST) Original-Received: from blah.blah (unknown [203.26.175.160]) by mailproxy2.pacific.net.au (Postfix) with ESMTP id 724B527416 for ; Thu, 12 May 2011 10:21:50 +1000 (EST) Original-Received: from gg by blah.blah with local (Exim 4.72) (envelope-from ) id 1QKJf6-0004g4-K7 for bug-gnu-emacs@gnu.org; Thu, 12 May 2011 10:21:52 +1000 User-Agent: Gnus/5.110011 (No Gnus v0.11) Emacs/23.2 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list Resent-Date: Wed, 11 May 2011 20:23: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:46403 Archived-At: --=-=-= C-h S in the various makefile-mode derivatives such as makefile-gmake-mode for GNUmakefile prompts for Use symbol help mode: where I hoped it would already know what to do. Perhaps something like the following, also confining the automake manual things to the automake mode. It and the make manual overlap in a few places, mainly variables like LFLAGS etc. 2011-05-11 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. Remove non-existent automake-mode, believe a hypothetical automake-mode would go to makefile-mode, not the other way around. (makefile-bsdmake-mode, makefile-gmake-mode, makefile-imake-mode) (makefile-makepp-mode): New setups, just going to makefile-mode. In particular makefile-gmake-mode lets lookups work from a GNUmakefile. --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=info-look.el.makefile-derivatives.diff --- info-look.el.orig 2011-05-12 08:36:49.000000000 +1000 +++ info-look.el 2011-05-12 10:13:37.000000000 +1000 @@ -720,11 +720,44 @@ :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 + ;; "##" 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)) + +;; makefile-mode derivatives going to plain makefile-mode. +(let ((regexp (info-lookup->regexp 'symbol 'makefile-mode)) + (parse-rule (info-lookup->parse-rule 'symbol 'makefile-mode))) + (dolist (mode '(makefile-bsdmake-mode + makefile-gmake-mode + makefile-imake-mode + makefile-makepp-mode)) + (info-lookup-maybe-add-help + :topic 'symbol + :mode mode + :regexp regexp + :parse-rule parse-rule + :other-modes '(makefile-mode)))) (info-lookup-maybe-add-help :mode 'texinfo-mode --=-=-= In GNU Emacs 23.2.1 (i486-pc-linux-gnu, GTK+ Version 2.20.0) of 2010-05-16 on raven, modified by Debian configured using `configure '--build' 'i486-linux-gnu' '--build' 'i486-linux-gnu' '--prefix=/usr' '--sharedstatedir=/var/lib' '--libexecdir=/usr/lib' '--localstatedir=/var/lib' '--infodir=/usr/share/info' '--mandir=/usr/share/man' '--with-pop=yes' '--enable-locallisppath=/etc/emacs23:/etc/emacs:/usr/local/share/emacs/23.2/site-lisp:/usr/local/share/emacs/site-lisp:/usr/share/emacs/23.2/site-lisp:/usr/share/emacs/site-lisp:/usr/share/emacs/23.2/leim' '--with-x=yes' '--with-x-toolkit=gtk' '--with-toolkit-scroll-bars' 'build_alias=i486-linux-gnu' 'CFLAGS=-DDEBIAN -g -O2' 'LDFLAGS=-g' 'CPPFLAGS='' Important settings: value of $LC_ALL: nil value of $LC_COLLATE: nil value of $LC_CTYPE: nil value of $LC_MESSAGES: nil value of $LC_MONETARY: nil value of $LC_NUMERIC: nil value of $LC_TIME: nil value of $LANG: en_AU value of $XMODIFIERS: nil locale-coding-system: iso-latin-1-unix default enable-multibyte-characters: t --=-=-=--