[Emacs-diffs] Changes to emacs/lisp/info.el

[Luc Teirlinck]

Index: emacs/lisp/info.el
diff -c emacs/lisp/info.el:1.358 emacs/lisp/info.el:1.359
*** emacs/lisp/info.el:1.358    Thu Jun 19 16:53:06 2003
--- emacs/lisp/info.el  Tue Jul  1 20:57:20 2003
***************
*** 139,145 ****
    :type '(repeat directory)
    :group 'info)
  
! (defcustom Info-scroll-prefer-subnodes t
    "*If non-nil, \\<Info-mode-map>\\[Info-scroll-up] in a menu visits subnodes.
  If this is non-nil, and you scroll far enough in a node that its menu
  appears on the screen, the next \\<Info-mode-map>\\[Info-scroll-up]
--- 139,145 ----
    :type '(repeat directory)
    :group 'info)
  
! (defcustom Info-scroll-prefer-subnodes nil
    "*If non-nil, \\<Info-mode-map>\\[Info-scroll-up] in a menu visits subnodes.
  If this is non-nil, and you scroll far enough in a node that its menu
  appears on the screen, the next \\<Info-mode-map>\\[Info-scroll-up]
***************
*** 1547,1555 ****
    (skip-chars-forward " \t\n")
    (let ((beg (point))
        str)
!     (while (not (looking-at ":*[,.;() \t\n]"))
!       (skip-chars-forward "^:")
!       (forward-char 1))
      (setq str
          (if (looking-at ":")
              (buffer-substring-no-properties beg (1- (point)))
--- 1547,1556 ----
    (skip-chars-forward " \t\n")
    (let ((beg (point))
        str)
!     (while (progn
!            (skip-chars-forward "^:")
!            (forward-char 1)
!            (not (looking-at ":*[,.;() \t\n]"))))
      (setq str
          (if (looking-at ":")
              (buffer-substring-no-properties beg (1- (point)))
***************
*** 2747,2753 ****
    "Add the face `info-menu-header' to any header before a menu entry."
    (save-excursion
      (goto-char (point-min))
!     (when (re-search-forward "\\* Menu:" nil t)
        (put-text-property (match-beginning 0) (match-end 0)
                         'font-lock-face 'info-menu-header)
        (while (re-search-forward "\n\n\\([^*\n ].*\\)\n\n?[*]" nil t)
--- 2748,2754 ----
    "Add the face `info-menu-header' to any header before a menu entry."
    (save-excursion
      (goto-char (point-min))
!     (when (re-search-forward "^\\* Menu:" nil t)
        (put-text-property (match-beginning 0) (match-end 0)
                         'font-lock-face 'info-menu-header)
        (while (re-search-forward "\n\n\\([^*\n ].*\\)\n\n?[*]" nil t)