(Help-Xref): Texinfo usage fix.

[gnu-emacs] / lisp / finder.el

diff --git a/lisp/finder.el b/lisp/finder.el
index 21ff1c9106329d22fa422c82a17c54dc7611d869..fb327524793fa94671c3fe38cc17c0eb217172f6 100644 (file)
--- a/lisp/finder.el
+++ b/lisp/finder.el
@@ -1,6 +1,6 @@
 ;;; finder.el --- topic & keyword-based code finder
 
-;; Copyright (C) 1992, 1997, 1998, 1999, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1992,97,98,1999,2001,2004  Free Software Foundation, Inc.
 
 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
 ;; Created: 16 Jun 1992
@@ -44,6 +44,9 @@
 ;; during byte-compilation (at which point it might be missing).
 (load "finder-inf" t t)
 
+(defvar finder-mode-hook nil
+  "*Hook run when function `finder-mode' is called.")
+
 ;; Local variable in finder buffer.
 (defvar finder-headmark)
 
@@ -58,7 +61,7 @@
     (calendar  . "calendar and time management support")
     (comm      . "communications, networking, remote access to files")
     (convenience . "convenience features for faster editing")
-    (data      . "support editing files of data")
+    (data      . "support for editing files of data")
     (docs      . "support for Emacs documentation")
     (emulations        . "emulations of other editors")
     (extensions        . "Emacs Lisp language extensions")
@@ -84,25 +87,24 @@
     (outlines   . "support for hierarchical outlining")
     (processes . "process, subshell, compilation, and job control support")
     (terminals . "support for terminal types")
-    (tex       . "code related to the TeX formatter")
+    (tex       . "supporting code for the TeX formatter")
     (tools     . "programming tools")
-    (unix      . "front-ends/assistants for, or emulators of, UNIX features")
+    (unix      . "front-ends/assistants for, or emulators of, UNIX-like features")
 ;; Not a custom group and not currently useful.
 ;;    (vms     . "support code for vms")
     (wp                . "word processing")
     ))
 
-(defvar finder-mode-map nil)
-(or finder-mode-map
-    (let ((map (make-sparse-keymap)))
-      (define-key map " "      'finder-select)
-      (define-key map "f"      'finder-select)
-      (define-key map [mouse-2]        'finder-mouse-select)
-      (define-key map "\C-m"   'finder-select)
-      (define-key map "?"      'finder-summary)
-      (define-key map "q"      'finder-exit)
-      (define-key map "d"      'finder-list-keywords)
-      (setq finder-mode-map map)))
+(defvar finder-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map " "        'finder-select)
+    (define-key map "f"        'finder-select)
+    (define-key map [mouse-2]  'finder-mouse-select)
+    (define-key map "\C-m"     'finder-select)
+    (define-key map "?"        'finder-summary)
+    (define-key map "q"        'finder-exit)
+    (define-key map "d"        'finder-list-keywords)
+    map))
 
 
 ;;; Code for regenerating the keyword list.
@@ -180,7 +182,7 @@ no arguments compiles from `load-path'."
 ;;; End:
 ;;; " (file-name-nondirectory generated-finder-keywords-file) " ends here\n")
       (kill-buffer "*finder-scratch*")
-      (eval-current-buffer) ;; So we get the new keyword list immediately
+      (eval-buffer) ;; So we get the new keyword list immediately
       (basic-save-buffer))))
 
 (defun finder-compile-keywords-make-dist ()
@@ -279,6 +281,7 @@ FILE should be in a form suitable for passing to `locate-library'."
        (error "Can't find any Commentary section"))
     ;; This used to use *Finder* but that would clobber the
     ;; directory of categories.
+    (delete-other-windows)
     (pop-to-buffer "*Finder-package*")
     (setq buffer-read-only nil)
     (erase-buffer)
@@ -298,11 +301,13 @@ FILE should be in a form suitable for passing to `locate-library'."
     (finder-summary)))
 
 (defun finder-current-item ()
-  (if (and finder-headmark (< (point) finder-headmark))
-      (error "No keyword or filename on this line")
-    (save-excursion
-      (beginning-of-line)
-      (current-word))))
+  (let ((key (save-excursion
+              (beginning-of-line)
+              (current-word))))
+    (if (or (and finder-headmark (< (point) finder-headmark))
+           (= (length key) 0))
+       (error "No keyword or filename on this line")
+      key)))
 
 (defun finder-select ()
   "Select item on current line in a finder buffer."
@@ -332,12 +337,13 @@ FILE should be in a form suitable for passing to `locate-library'."
 \\[finder-select]      more help for the item on the current line
 \\[finder-exit]        exit Finder mode and kill the Finder buffer."
   (interactive)
+  (kill-all-local-variables)
   (use-local-map finder-mode-map)
   (set-syntax-table emacs-lisp-mode-syntax-table)
   (setq mode-name "Finder")
   (setq major-mode 'finder-mode)
-  (make-local-variable 'finder-headmark)
-  (setq finder-headmark nil))
+  (set (make-local-variable 'finder-headmark) nil)
+  (run-mode-hooks 'finder-mode-hook))
 
 (defun finder-summary ()
   "Summarize basic Finder commands."
@@ -362,4 +368,5 @@ finder directory, \\[finder-exit] = quit, \\[finder-summary] = help")))
 \f
 (provide 'finder)
 
+;;; arch-tag: ec85ff49-8cb8-41f5-a63f-9131d53ce2c5
 ;;; finder.el ends here