[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/info.el
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/info.el |
Date: |
Mon, 29 Apr 2002 22:08:56 -0400 |
Index: emacs/lisp/info.el
diff -c emacs/lisp/info.el:1.296 emacs/lisp/info.el:1.297
*** emacs/lisp/info.el:1.296 Sat Apr 27 16:16:09 2002
--- emacs/lisp/info.el Mon Apr 29 22:08:56 2002
***************
*** 539,545 ****
(beginning-of-line)
(when (re-search-forward regexp nil t)
(list (string-equal "Ref:" (match-string 1))
! (1+ (read (current-buffer)))
major-mode)))))
(defun Info-find-in-tag-table (marker regexp)
--- 539,545 ----
(beginning-of-line)
(when (re-search-forward regexp nil t)
(list (string-equal "Ref:" (match-string 1))
! (+ (point-min) (read (current-buffer)))
major-mode)))))
(defun Info-find-in-tag-table (marker regexp)
***************
*** 929,935 ****
thisfilepos thisfilename)
(search-forward ": ")
(setq thisfilename (buffer-substring beg (- (point) 2)))
! (setq thisfilepos (read (current-buffer)))
;; read in version 19 stops at the end of number.
;; Advance to the next line.
(forward-line 1)
--- 929,935 ----
thisfilepos thisfilename)
(search-forward ": ")
(setq thisfilename (buffer-substring beg (- (point) 2)))
! (setq thisfilepos (+ (point-min) (read (current-buffer))))
;; read in version 19 stops at the end of number.
;; Advance to the next line.
(forward-line 1)
***************
*** 1074,1092 ****
;; It does completion using the alist in Info-read-node-completion-table
;; unless STRING starts with an open-paren.
(defun Info-read-node-name-1 (string predicate code)
! (let ((no-completion (and (> (length string) 0) (eq (aref string 0) ?\())))
! (cond ((eq code nil)
! (if no-completion
! string
! (try-completion string Info-read-node-completion-table predicate)))
! ((eq code t)
! (if no-completion
! nil
! (all-completions string Info-read-node-completion-table
predicate)))
! ((eq code 'lambda)
! (if no-completion
! t
! (assoc string Info-read-node-completion-table))))))
(defun Info-read-node-name (prompt &optional default)
(let* ((completion-ignore-case t)
--- 1074,1108 ----
;; It does completion using the alist in Info-read-node-completion-table
;; unless STRING starts with an open-paren.
(defun Info-read-node-name-1 (string predicate code)
! (cond
! ;; First complete embedded file names.
! ((string-match "\\`([^)]*\\'" string)
! (let ((file (substring string 1)))
! (cond
! ((eq code nil)
! (let ((comp (try-completion file 'locate-file-completion
! (cons Info-directory-list
! (mapcar 'car Info-suffix-list)))))
! (cond
! ((eq comp t) (concat string ")"))
! (comp (concat "(" comp)))))
! ((eq code t) (all-completions file 'locate-file-completion
! (cons Info-directory-list
! (mapcar 'car Info-suffix-list))))
! (t nil))))
! ;; If a file name was given, then any node is fair game.
! ((string-match "\\`(" string)
! (cond
! ((eq code nil) string)
! ((eq code t) nil)
! (t t)))
! ;; Otherwise use Info-read-node-completion-table.
! ((eq code nil)
! (try-completion string Info-read-node-completion-table predicate))
! ((eq code t)
! (all-completions string Info-read-node-completion-table predicate))
! (t
! (test-completion string Info-read-node-completion-table predicate))))
(defun Info-read-node-name (prompt &optional default)
(let* ((completion-ignore-case t)
***************
*** 1443,1450 ****
(while
(progn
(while (re-search-forward pattern nil t)
! (push (cons (match-string-no-properties 1)
! (match-beginning 1))
completions))
;; Check subsequent nodes if applicable.
(and Info-complete-next-re
--- 1459,1465 ----
(while
(progn
(while (re-search-forward pattern nil t)
! (push (match-string-no-properties 1)
completions))
;; Check subsequent nodes if applicable.
(and Info-complete-next-re