bug-gnu-emacs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [address@hidden: Re: ":" in Scheme names.]


From: Thien-Thi Nguyen
Subject: Re: [address@hidden: Re: ":" in Scheme names.]
Date: 24 Jan 2003 20:03:06 -0500

there are some deeper changes necessary to properly encode the
":"-in-menu-item cases, which i am looking into.  for now, i have just
committed the patch below, which fixes "m" handling for slib.info.gz test
case:

; type                       ; expect
  i RET                        buffer changes to show index
  C-s array-indexes RET        point moves to match
  m RET                        buffer changes to show array mapping funcs
  l                            back to index
  C-s batch: RET               point moves to match
  m RET                        buffer changes to show batch funcs

there are still bugs in areas: completion for index, TAB command, font
locking.  i will get to them shortly.

thi


__________________________________________________
cd /home/ttn/build/GNU/emacs/lisp/
cvs diff -w -c -b info.el
Index: info.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/info.el,v
retrieving revision 1.331
diff -w -c -b -r1.331 info.el
*** info.el     22 Jan 2003 20:35:23 -0000      1.331
--- info.el     25 Jan 2003 00:33:45 -0000
***************
*** 27,32 ****
--- 27,36 ----
  ;;; Commentary:
  
  ;; Note that nowadays we expect info files to be made using makeinfo.
+ ;; In particular we make these assumptions:
+ ;;  - a menu item MAY contain colons but not colon-space ": "
+ ;;  - a menu item ending with ": " (but not ":: ") is an index entry
+ ;;  - a node name MAY NOT contain a colon
  
  ;;; Code:
  
***************
*** 2119,2126 ****
--- 2123,2140 ----
       ((setq node (Info-get-token (point) "\\*note[ \n]"
                                 "\\*note[ \n]\\([^:]*\\):"))
        (Info-follow-reference node))
+      ;; explicit node name
       ((setq node (Info-get-token (point) "\\* +" "\\* +\\([^:]*\\)::"))
        (Info-goto-node node))
+      ;; index entry (Another approach is to combine this w/ the following cond
+      ;;              branch "other menu item", but that also requires fixing
+      ;;              Info-extract-menu-node-name -- stay tuned. --ttn)
+      ((Info-get-token (point) "\\* +" "\\* +\\(.*\\):[ \t]")
+       (save-excursion
+         (re-search-forward ":[ \t]")
+         (setq node (Info-following-node-name "^.")))
+       (Info-goto-node node))
+      ;; other menu item
       ((Info-get-token (point) "\\* +" "\\* +\\([^:]*\\):")
        (beginning-of-line)
        (forward-char 2)

Compilation exited abnormally with code 1 at Fri Jan 24 16:32:01




reply via email to

[Prev in Thread] Current Thread [Next in Thread]