(replace_buffer_in_all_windows):

[bpt/emacs.git] / lisp / finder.el

diff --git a/lisp/finder.el b/lisp/finder.el
index d86a18e..19929e0 100644 (file)
--- a/lisp/finder.el
+++ b/lisp/finder.el
@@ -1,6 +1,6 @@
 ;;; finder.el --- topic & keyword-based code finder
 
-;; Copyright (C) 1992 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 1997 Free Software Foundation, Inc.
 
 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
 ;; Created: 16 Jun 1992
@@ -87,6 +87,7 @@
     (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)
@@ -117,7 +118,12 @@ arguments compiles from `load-path'."
        (lambda (d)
         (mapcar
          (lambda (f) 
-           (if (and (string-match "^[^=].*\\.el$" f)
+           (if (and (or (string-match "^[^=].*\\.el$" f)
+                        ;; Allow compressed files also.  Fixme:
+                        ;; generalize this, especially for
+                        ;; MS-DOG-type filenames.
+                        (and (string-match "^[^=].*\\.el\\.\\(gz\\|Z\\)$" f)
+                             (require 'jka-compr)))
                     (not (member f processed)))
                (let (summary keystart keywords)
                  (setq processed (cons f processed))
@@ -130,7 +136,10 @@ arguments compiles from `load-path'."
                    (setq summary (lm-synopsis))
                    (setq keywords (lm-keywords)))
                  (insert
-                  (format "    (\"%s\"\n        " f))
+                  (format "    (\"%s\"\n        "
+                          (if (string-match "\\.\\(gz\\|Z\\)$" f)
+                              (file-name-sans-extension f) 
+                            f)))
                  (prin1 summary (current-buffer))
                  (insert
                   "\n        ")
@@ -172,23 +181,29 @@ arguments compiles from `load-path'."
 (defun finder-list-keywords ()
   "Display descriptions of the keywords in the Finder buffer."
   (interactive)
-  (setq buffer-read-only nil)
-  (erase-buffer)
-  (mapcar
-   (lambda (assoc)
-     (let ((keyword (car assoc)))
-       (insert (symbol-name keyword))
-       (finder-insert-at-column 14 (concat (cdr assoc) "\n"))
-       (cons (symbol-name keyword) keyword)))
-   finder-known-keywords)
-  (goto-char (point-min))
-  (setq finder-headmark (point))
-  (setq buffer-read-only t)
-  (set-buffer-modified-p nil)
-  (balance-windows)
-  (finder-summary))
+  (if (get-buffer "*Finder*")
+      (pop-to-buffer "*Finder*")
+    (pop-to-buffer (set-buffer (get-buffer-create "*Finder*")))
+    (finder-mode)
+    (setq buffer-read-only nil)
+    (erase-buffer)
+    (mapcar
+     (lambda (assoc)
+       (let ((keyword (car assoc)))
+        (insert (symbol-name keyword))
+        (finder-insert-at-column 14 (concat (cdr assoc) "\n"))
+        (cons (symbol-name keyword) keyword)))
+     finder-known-keywords)
+    (goto-char (point-min))
+    (setq finder-headmark (point))
+    (setq buffer-read-only t)
+    (set-buffer-modified-p nil)
+    (balance-windows)
+    (finder-summary)))
 
 (defun finder-list-matches (key)
+  (pop-to-buffer (set-buffer (get-buffer-create "*Finder Category*")))
+  (finder-mode)
   (setq buffer-read-only nil)
   (erase-buffer)
   (let ((id (intern key)))
@@ -209,23 +224,9 @@ arguments compiles from `load-path'."
     (shrink-window-if-larger-than-buffer)
     (finder-summary)))
 
-;; Search for a file named FILE the same way `load' would search.
-(defun finder-find-library (file)
-  (if (file-name-absolute-p file)
-      file
-    (let ((dirs load-path)
-         found)
-      (while (and dirs (not found))
-       (if (file-exists-p (expand-file-name (concat file ".el") (car dirs)))
-           (setq found (expand-file-name file (car dirs)))
-         (if (file-exists-p (expand-file-name file (car dirs)))
-             (setq found (expand-file-name file (car dirs)))))
-       (setq dirs (cdr dirs)))
-      found)))
-
 (defun finder-commentary (file)
   (interactive)
-  (let* ((str (lm-commentary (finder-find-library file))))
+  (let* ((str (lm-commentary (locate-library file))))
     (if (null str)
        (error "Can't find any Commentary section"))
     (pop-to-buffer "*Finder*")
@@ -255,14 +256,21 @@ arguments compiles from `load-path'."
 (defun finder-select ()
   (interactive)
   (let ((key (finder-current-item)))
-    (if (string-match "\\.el$" key)
-       (finder-commentary key)
-      (finder-list-matches key))))
+      (if (string-match "\\.el$" key)
+         (finder-commentary key)
+       (finder-list-matches key))))
+
+(defun finder-mouse-select (event)
+  (interactive "e")
+  (save-excursion
+       (set-buffer (window-buffer (posn-window (event-start event))))
+       (goto-char (posn-point (event-start event)))
+       (let ((key (finder-current-item)))
+      (finder-select))))
 
 (defun finder-by-keyword ()
   "Find packages matching a given keyword."
   (interactive)
-  (finder-mode)
   (finder-list-keywords))
 
 (defun finder-mode ()
@@ -272,9 +280,6 @@ arguments compiles from `load-path'."
 \\[finder-exit]        exit Finder mode and kill the Finder buffer.
 "
   (interactive)
-  (pop-to-buffer "*Finder*")
-  (setq buffer-read-only nil)
-  (erase-buffer)
   (use-local-map finder-mode-map)
   (set-syntax-table emacs-lisp-mode-syntax-table)
   (setq mode-name "Finder")
@@ -287,13 +292,21 @@ arguments compiles from `load-path'."
   (interactive)
   (message "%s"
    (substitute-command-keys
-    "\\<finder-mode-map>\\[finder-select] = select, \\[finder-list-keywords] = to finder directory, \\[finder-exit] = quit, \\[finder-summary] = help")))
+    "\\<finder-mode-map>\\[finder-select] = select, \\[finder-mouse-select] = select, \\[finder-list-keywords] = to finder directory, \\[finder-exit] = quit, \\[finder-summary] = help")))
 
 (defun finder-exit ()
   "Exit Finder mode and kill the buffer"
   (interactive)
-  (delete-window)
-  (kill-buffer "*Finder*"))
+  (condition-case nil                  ; might be sole window
+      (delete-window)
+    (error nil))
+  ;; Can happen in either buffer -- kill each of the two that exists
+  (condition-case nil
+      (kill-buffer "*Finder*")
+    (error nil))
+  (condition-case nil
+      (kill-buffer "*Finder Category*")
+    (error nil)))
 
 (provide 'finder)