/[emacs]/emacs/lisp/info.el
ViewVC logotype

Diff of /emacs/lisp/info.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.420 by jurta, Tue Mar 15 10:46:00 2005 UTC revision 1.421 by jurta, Wed Mar 16 07:32:43 2005 UTC
# Line 202  a tab, a carriage return (control-M), a Line 202  a tab, a carriage return (control-M), a
202    :group 'info)    :group 'info)
203    
204  (defcustom Info-isearch-search t  (defcustom Info-isearch-search t
205    "*If non-nil, isearch invoked in Info mode uses `Info-search' function.    "*If non-nil, isearch in Info searches through multiple nodes.
206  This allows isearch to search through multiple nodes.  Before leaving the initial Info node, where isearch was started,
207  When isearch fails, it wraps and restarts the search from the  it fails once with the error message [initial node], and with
208  top/final node depending on search direction."  subsequent C-s/C-r continues through other nodes without failing
209    with this error message in other nodes.  When isearch fails for
210    the rest of the manual, it wraps aroung the whole manual and
211    restarts the search from the top/final node depending on
212    search direction.
213    
214    Setting this option to nil restores the default isearch behavior
215    with wrapping around the current Info node."
216    :version "22.1"    :version "22.1"
217    :type 'boolean    :type 'boolean
218    :group 'info)    :group 'info)
# Line 625  NO-GOING-BACK is non-nil if recovering f Line 632  NO-GOING-BACK is non-nil if recovering f
632  it says do not attempt further (recursive) error recovery."  it says do not attempt further (recursive) error recovery."
633    (info-initialize)    (info-initialize)
634    (setq filename (Info-find-file filename))    (setq filename (Info-find-file filename))
635      ;; Go into info buffer.
636      (or (eq major-mode 'Info-mode) (pop-to-buffer "*info*"))
637    ;; Record the node we are leaving.    ;; Record the node we are leaving.
638    (if (and Info-current-file (not no-going-back))    (if (and Info-current-file (not no-going-back))
639        (setq Info-history        (setq Info-history
640              (cons (list Info-current-file Info-current-node (point))              (cons (list Info-current-file Info-current-node (point))
641                    Info-history)))                    Info-history)))
   ;; Go into info buffer.  
   (or (eq major-mode 'Info-mode) (pop-to-buffer "*info*"))  
642    (Info-find-node-2 filename nodename no-going-back))    (Info-find-node-2 filename nodename no-going-back))
643    
644  (defun Info-on-current-buffer (&optional nodename)  (defun Info-on-current-buffer (&optional nodename)
# Line 3616  Preserve text properties." Line 3623  Preserve text properties."
3623        ;; Fontify titles        ;; Fontify titles
3624        (goto-char (point-min))        (goto-char (point-min))
3625        (when not-fontified-p        (when not-fontified-p
3626          (while (re-search-forward "\n\\([^ \t\n].+\\)\n\\(\\*+\\|=+\\|-+\\|\\.+\\)$"          (while (re-search-forward "\n\\([^ \t\n].+\\)\n\\(\\*\\*+\\|==+\\|--+\\|\\.\\.+\\)$"
3627                                    nil t)                                    nil t)
3628            (let* ((c (preceding-char))            (let* ((c (preceding-char))
3629                   (face                   (face
# Line 3793  Preserve text properties." Line 3800  Preserve text properties."
3800                (add-text-properties                (add-text-properties
3801                 (match-beginning 1) (match-end 1)                 (match-beginning 1) (match-end 1)
3802                 (list                 (list
3803                  'help-echo (if (match-end 3)                  'help-echo (if (and (match-end 3)
3804                                        (not (equal (match-string 3) "")))
3805                                 (concat "mouse-2: go to " (match-string 3))                                 (concat "mouse-2: go to " (match-string 3))
3806                               "mouse-2: go to this node")                               "mouse-2: go to this node")
3807                  'mouse-face 'highlight)))                  'mouse-face 'highlight)))
# Line 4071  BUFFER is the buffer speedbar is request Line 4079  BUFFER is the buffer speedbar is request
4079    (Info-speedbar-hierarchy-buttons nil 0)    (Info-speedbar-hierarchy-buttons nil 0)
4080    )    )
4081    
4082  (dolist (mess '("^Node has no Previous$"  (dolist (mess '("^First node in file$"
4083                    "^No `.*' in index$"
4084                    "^No cross-reference named"
4085                    "^No cross.references in this node$"
4086                    "^No current info node$"
4087                  "^No menu in this node$"                  "^No menu in this node$"
4088                  "^Node has no Next$"                  "^No more items in menu$"
4089                  "^No cross-references in this node^"                  "^No more nodes$"
4090                  search-failed                  "^No pointer \\(?:forward\\|backward\\) from this node$"
4091                  "^No \".*\" in index$"))                  "^No previous `i' command$"
4092                    "^No previous items in menu$"
4093                    "^No previous nodes$"
4094                    "^No such item in menu$"
4095                    "^No such node or anchor"
4096                    "^Node has no"
4097                    "^Point neither on reference nor in menu item description$"
4098                    "^This is the \\(?:first\\|last\\) Info node you looked at$"
4099                    search-failed))
4100    (add-to-list 'debug-ignored-errors mess))    (add-to-list 'debug-ignored-errors mess))
4101    
4102  ;;;;  Desktop support  ;;;;  Desktop support

Legend:
Removed from v.1.420  
changed lines
  Added in v.1.421

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26