# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1130191988 0
# Node ID 4e56b3fda00295d8969e8dfdb20ddd880b213612
# Parent  8438430a751aae11a8917112ac5a6be182da19ec
	* 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 -r 8438430a751a -r 4e56b3fda002 lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Oct 24 22:06:47 2005 +0000
+++ b/lisp/ChangeLog	Mon Oct 24 22:13:08 2005 +0000
@@ -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 -r 8438430a751a -r 4e56b3fda002 lisp/finder.el
--- a/lisp/finder.el	Mon Oct 24 22:06:47 2005 +0000
+++ b/lisp/finder.el	Mon Oct 24 22:13:08 2005 +0000
@@ -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 -r 8438430a751a -r 4e56b3fda002 lisp/menu-bar.el
--- a/lisp/menu-bar.el	Mon Oct 24 22:06:47 2005 +0000
+++ b/lisp/menu-bar.el	Mon Oct 24 22:13:08 2005 +0000
@@ -1342,7 +1342,7 @@
 	      :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 -r 8438430a751a -r 4e56b3fda002 lisp/thumbs.el
--- a/lisp/thumbs.el	Mon Oct 24 22:06:47 2005 +0000
+++ b/lisp/thumbs.el	Mon Oct 24 22:13:08 2005 +0000
@@ -339,6 +339,7 @@
   (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)