From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Kevin Ryde Newsgroups: gmane.emacs.devel Subject: info-look.el and colons in info indexes Date: Sat, 10 May 2003 09:55:25 +1000 Sender: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Message-ID: <87of2bu13m.fsf@zip.com.au> NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: main.gmane.org 1052524572 4309 80.91.224.249 (9 May 2003 23:56:12 GMT) X-Complaints-To: usenet@main.gmane.org NNTP-Posting-Date: Fri, 9 May 2003 23:56:12 +0000 (UTC) Original-X-From: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Sat May 10 01:56:10 2003 Return-path: Original-Received: from quimby.gnus.org ([80.91.224.244]) by main.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 19EHik-00017M-00 for ; Sat, 10 May 2003 01:56:10 +0200 Original-Received: from monty-python.gnu.org ([199.232.76.173]) by quimby.gnus.org with esmtp (Exim 3.12 #1 (Debian)) id 19EHnv-0004Uz-00 for ; Sat, 10 May 2003 02:01:31 +0200 Original-Received: from localhost ([127.0.0.1] helo=monty-python.gnu.org) by monty-python.gnu.org with esmtp (Exim 4.10.13) id 19EHjR-0008QN-00 for emacs-devel@quimby.gnus.org; Fri, 09 May 2003 19:56:53 -0400 Original-Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.10.13) id 19EHih-0008Cg-00 for emacs-devel@gnu.org; Fri, 09 May 2003 19:56:07 -0400 Original-Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.10.13) id 19EHif-0008At-00 for emacs-devel@gnu.org; Fri, 09 May 2003 19:56:06 -0400 Original-Received: from snoopy.pacific.net.au ([61.8.0.36]) by monty-python.gnu.org with esmtp (Exim 4.10.13) id 19EHiR-000842-00 for emacs-devel@gnu.org; Fri, 09 May 2003 19:55:51 -0400 Original-Received: from sunny.pacific.net.au (sunny.pacific.net.au [203.2.228.40]) h49NtnPc003537 for ; Sat, 10 May 2003 09:55:49 +1000 Original-Received: from wisma.pacific.net.au (wisma.pacific.net.au [210.23.129.72]) by sunny.pacific.net.au with ESMTP id h49NtnQg021278 for ; Sat, 10 May 2003 09:55:49 +1000 (EST) Original-Received: from localhost (ppp60.dyn228.pacific.net.au [203.143.228.60]) by wisma.pacific.net.au (8.12.9/8.12.9) with ESMTP id h49NtjYa028046 for ; Sat, 10 May 2003 09:55:48 +1000 (EST) Original-Received: from gg by localhost with local (Exim 3.35 #1 (Debian)) id 19EHi2-0000f9-00; Sat, 10 May 2003 09:55:26 +1000 Original-To: emacs-devel@gnu.org User-Agent: Gnus/5.090019 (Oort Gnus v0.19) Emacs/21.2 (gnu/linux) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1b5 Precedence: list List-Id: Emacs development discussions. List-Help: List-Post: List-Subscribe: , List-Archive: List-Unsubscribe: , Errors-To: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Xref: main.gmane.org gmane.emacs.devel:13789 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:13789 --=-=-= The following lets C-h C-i work on Guile procedures with colons in their name, like `match:count'. It follows what info.el does nowadays, assuming I understand the "index entry" case in Info-try-follow-nearest-node. * info-look.el (info-lookup-make-completions): Allow colons in index entries by looking for ": " to terminate, as per latest info.el. The guile manual isn't in info-look's defaults (for scheme-mode), but the spot below will add it in order to see the effect of the change. (require 'info-look) (info-lookup-add-help :mode 'scheme-mode :regexp "[^()'\" \t\n]+" :ignore-case t :doc-spec '(("(guile)Procedure Index" nil "^[ \t]+- [^:]+:[ \t]*" "\\($\\| \\)"))) --=-=-= Content-Disposition: attachment; filename=info-look.el.colons.diff Index: info-look.el =================================================================== RCS file: /cvsroot/emacs/emacs/lisp/info-look.el,v retrieving revision 1.32 diff -u -c -F^( -r1.32 info-look.el cvs server: conflicting specifications of output style *** info-look.el 5 Apr 2003 12:58:02 -0000 1.32 --- info-look.el 9 May 2003 23:28:38 -0000 *************** *** 1,7 **** ;;; info-look.el --- major-mode-sensitive Info index lookup facility ;; An older version of this was known as libc.el. ! ;; Copyright (C) 1995,96,97,98,99,2001 Free Software Foundation, Inc. ;; Author: Ralph Schleicher ;; (did not show signs of life (Nov 2001) -stef) --- 1,7 ---- ;;; info-look.el --- major-mode-sensitive Info index lookup facility ;; An older version of this was known as libc.el. ! ;; Copyright (C) 1995,96,97,98,99,2001, 2003 Free Software Foundation, Inc. ;; Author: Ralph Schleicher ;; (did not show signs of life (Nov 2001) -stef) *************** (defun info-lookup-make-completions (top *** 468,474 **** (progn (goto-char (point-min)) (and (search-forward "\n* Menu:" nil t) ! (while (re-search-forward "\n\\* \\([^:\t\n]*\\):" nil t) (setq entry (match-string 1) item (funcall trans entry)) ;; `trans' can return nil if the regexp doesn't match. --- 468,474 ---- (progn (goto-char (point-min)) (and (search-forward "\n* Menu:" nil t) ! (while (re-search-forward "\n\\* \\(.*\\): " nil t) (setq entry (match-string 1) item (funcall trans entry)) ;; `trans' can return nil if the regexp doesn't match. --=-=-= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit _______________________________________________ Emacs-devel mailing list Emacs-devel@gnu.org http://mail.gnu.org/mailman/listinfo/emacs-devel --=-=-=--