* 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.

4 files changed, 10 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f4c79951b71..99c145ff8d7 100644
--- 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 737bb676a1a..dfbd6851129 100644
--- 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 9a5d47656ab..af5e380153e 100644
--- 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 0fa448d4d7a..9a41507e410 100644
--- 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)