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

[Miles Bader]

Index: emacs/lisp/info.el
diff -c emacs/lisp/info.el:1.304.2.16 emacs/lisp/info.el:1.304.2.17
*** emacs/lisp/info.el:1.304.2.16       Thu Sep 16 00:12:21 2004
--- emacs/lisp/info.el  Mon Oct 25 04:19:40 2004
***************
*** 79,86 ****
    :group 'info)
  
  (defface info-xref
!   '((((class color) (background light)) :foreground "blue")
!     (((class color) (background dark)) :foreground "cyan")
      (t :underline t))
    "Face for Info cross-references."
    :group 'info)
--- 79,86 ----
    :group 'info)
  
  (defface info-xref
!   '((((class color) (background light)) :foreground "blue" :underline t)
!     (((class color) (background dark)) :foreground "cyan" :underline t)
      (t :underline t))
    "Face for Info cross-references."
    :group 'info)
***************
*** 455,460 ****
--- 455,461 ----
  
  ;;;###autoload (add-hook 'same-window-regexps "\\*info\\*\\(\\|<[0-9]+>\\)")
  
+ ;;;###autoload (put 'info 'info-file "emacs")
  ;;;###autoload
  (defun info (&optional file buffer)
    "Enter Info, the documentation browser.
***************
*** 1729,1735 ****
        (let ((inhibit-read-only t))
          (erase-buffer)
          (goto-char (point-min))
!         (insert "\n\^_\nFile: history Node: Top, Up: (dir)\n\n")
          (insert "Recently Visited Nodes\n**********************\n\n")
          (insert "* Menu:\n\n")
          (let ((hl (delete '("history" "Top") Info-history-list)))
--- 1730,1736 ----
        (let ((inhibit-read-only t))
          (erase-buffer)
          (goto-char (point-min))
!         (insert "\n\^_\nFile: history,  Node: Top,  Up: (dir)\n\n")
          (insert "Recently Visited Nodes\n**********************\n\n")
          (insert "* Menu:\n\n")
          (let ((hl (delete '("history" "Top") Info-history-list)))
***************
*** 1749,1774 ****
    "Go to a node with table of contents of the current Info file.
  Table of contents is created from the tree structure of menus."
    (interactive)
!   (let ((curr-file Info-current-file)
!         (curr-node Info-current-node)
          p)
      (with-current-buffer (get-buffer-create " *info-toc*")
        (let ((inhibit-read-only t)
              (node-list (Info-build-toc curr-file)))
          (erase-buffer)
          (goto-char (point-min))
!         (insert "\n\^_\nFile: toc Node: Top, Up: (dir)\n\n")
          (insert "Table of Contents\n*****************\n\n")
!         (insert "*Note Top::\n")
          (Info-insert-toc
           (nth 2 (assoc "Top" node-list)) ; get Top nodes
!          node-list 0 (substring-no-properties curr-file)))
        (if (not (bobp))
            (let ((Info-hide-note-references 'hide)
                  (Info-fontify-visited-nodes nil))
              (Info-mode)
              (setq Info-current-file "toc" Info-current-node "Top")
!             (Info-fontify-node)))
        (goto-char (point-min))
        (if (setq p (search-forward (concat "*Note " curr-node ":") nil t))
            (setq p (- p (length curr-node) 2))))
--- 1750,1780 ----
    "Go to a node with table of contents of the current Info file.
  Table of contents is created from the tree structure of menus."
    (interactive)
!   (let ((curr-file (substring-no-properties Info-current-file))
!         (curr-node (substring-no-properties Info-current-node))
          p)
      (with-current-buffer (get-buffer-create " *info-toc*")
        (let ((inhibit-read-only t)
              (node-list (Info-build-toc curr-file)))
          (erase-buffer)
          (goto-char (point-min))
!         (insert "\n\^_\nFile: toc,  Node: Top,  Up: (dir)\n\n")
          (insert "Table of Contents\n*****************\n\n")
!         (insert "*Note Top: (" curr-file ")Top.\n")
          (Info-insert-toc
           (nth 2 (assoc "Top" node-list)) ; get Top nodes
!          node-list 0 curr-file))
        (if (not (bobp))
            (let ((Info-hide-note-references 'hide)
                  (Info-fontify-visited-nodes nil))
              (Info-mode)
              (setq Info-current-file "toc" Info-current-node "Top")
!             (goto-char (point-min))
!             (narrow-to-region (or (re-search-forward "\n[\^_\f]\n" nil t)
!                                   (point-min))
!                               (point-max))
!             (Info-fontify-node)
!             (widen)))
        (goto-char (point-min))
        (if (setq p (search-forward (concat "*Note " curr-node ":") nil t))
            (setq p (- p (length curr-node) 2))))
***************
*** 1789,1802 ****
  
  (defun Info-build-toc (file)
    "Build table of contents from menus of Info FILE and its subfiles."
-   (if (equal file "dir")
-       (error "Table of contents for Info directory is not supported yet"))
    (with-temp-buffer
!     (let* ((default-directory (or (and (stringp file)
!                                        (file-name-directory
!                                         (setq file (Info-find-file file))))
                                    default-directory))
!            (main-file file)
             (sections '(("Top" "Top")))
             nodes subfiles)
        (while (or main-file subfiles)
--- 1795,1806 ----
  
  (defun Info-build-toc (file)
    "Build table of contents from menus of Info FILE and its subfiles."
    (with-temp-buffer
!     (let* ((file (and (stringp file) (Info-find-file file)))
!            (default-directory (or (and (stringp file)
!                                        (file-name-directory file))
                                    default-directory))
!            (main-file (and (stringp file) file))
             (sections '(("Top" "Top")))
             nodes subfiles)
        (while (or main-file subfiles)
***************
*** 3258,3263 ****
--- 3262,3268 ----
                           (car elt)
                         elt))
                 (file (if (consp elt) (cdr elt) elt))
+                (case-fold-search nil)
                 (regexp (concat "\\`" (regexp-quote name)
                                 "\\(\\'\\|-\\)")))
            (if (string-match regexp (symbol-name command))