(finder-mode): Follow coding convention.

diff --git a/lisp/finder.el b/lisp/finder.el
index 40629cab6afc8f19074673ce871c13f4eb99d443..dc7343b9fb024e72587c8ba62a3f404504a80dd0 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
@@ -95,17 +95,16 @@
     (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.
@@ -336,13 +335,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)
-  (run-hooks 'finder-mode-hook))
+  (set (make-local-variable 'finder-headmark) nil)
+  (run-mode-hooks 'finder-mode-hook))
 
 (defun finder-summary ()
   "Summarize basic Finder commands."