* menu-bar.el (menu-bar-help-menu): Rename "psychiatrist", in line

	with 2005-10-23 change to doctor.el.

	* finder.el (finder-mode-map): Add follow-link binding.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f4c79951b71a1b6fe7dcd56eef70b9d41654d8b6..99c145ff8d7ac2748d74c83150d6bff23e6a2f23 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2005-10-24  Chong Yidong  <cyd@stupidchicken.com>
+
+       * menu-bar.el (menu-bar-help-menu): Rename "psychiatrist", in line
+       with 2005-10-23 change to doctor.el.
+
+       * finder.el (finder-mode-map): Add follow-link binding.
+
 2005-10-25  Kim F. Storm  <storm@cua.dk>
 
        * progmodes/gdb-ui.el (gdb-ann3): Bind mouse-3 in left fringe

diff --git a/lisp/finder.el b/lisp/finder.el
index 737bb676a1a131ee94ab153e6a021999bcdd60ad..dfbd6851129207184274c4a78b02716d276976b4 100644 (file)
--- a/lisp/finder.el
+++ b/lisp/finder.el
@@ -100,6 +100,7 @@
   (let ((map (make-sparse-keymap)))
     (define-key map " "        'finder-select)
     (define-key map "f"        'finder-select)
+    (define-key map [follow-link] 'mouse-face)
     (define-key map [mouse-2]  'finder-mouse-select)
     (define-key map "\C-m"     'finder-select)
     (define-key map "?"        'finder-summary)

diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 9a5d47656abe081f7edf6ce0f80f0e2852aaa275..af5e380153ef80e3dd626a51c92da00e86363680 100644 (file)
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -1342,7 +1342,7 @@ key, a click, or a menu-item"))
              :help "Display manual section that describes a key"))
 
 (define-key menu-bar-help-menu [eliza]
-  '(menu-item "Emacs Psychiatrist" doctor
+  '(menu-item "Emacs Therapist" doctor
              :help "Our doctor will help you feel better"))
 (define-key menu-bar-help-menu [sep4]
   '("--"))

diff --git a/lisp/thumbs.el b/lisp/thumbs.el
index 0fa448d4d7a1e5aa8f8e7fac78e6837938344704..9a41507e41004ecb4b22e9af89a2ba1f7fe2de43 100644 (file)
--- a/lisp/thumbs.el
+++ b/lisp/thumbs.el
@@ -339,6 +339,7 @@ Or, alternatively, a SIZE may be specified."
   (cond ((string-match ".*\\.jpe?g\\'" img) 'jpeg)
        ((string-match ".*\\.xpm\\'" img) 'xpm)
        ((string-match ".*\\.xbm\\'" img) 'xbm)
+       ((string-match ".*\\.pbm\\'" img) 'pbm)
        ((string-match ".*\\.gif\\'" img) 'gif)
        ((string-match ".*\\.bmp\\'" img) 'bmp)
        ((string-match ".*\\.png\\'" img) 'png)