# HG changeset patch
# User Jan Dj¸«£rv <jan.h.d@swipnet.se>
# Date 1135337768 0
# Node ID 31f77129bc927b5619a46140d35ef767e0de9700
# Parent  5b8799d65159d193dbef5a0258b09928999ef613
* menu-bar.el (menu-find-file-existing): New function.
(menu-bar-file-menu): Use menu-find-file-existing for Open.

* tool-bar.el (tool-bar-setup): open changed to menu-find-file-existing.

diff -r 5b8799d65159 -r 31f77129bc92 lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Dec 23 11:34:13 2005 +0000
+++ b/lisp/ChangeLog	Fri Dec 23 11:36:08 2005 +0000
@@ -1,3 +1,10 @@
+2005-12-23  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+	* menu-bar.el (menu-find-file-existing): New function.
+	(menu-bar-file-menu): Use menu-find-file-existing for Open.
+
+	* tool-bar.el (tool-bar-setup): open changed to menu-find-file-existing.
+
 2005-12-22  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* vc.el: Remove unnecessary leading * in docstrings.
diff -r 5b8799d65159 -r 31f77129bc92 lisp/menu-bar.el
--- a/lisp/menu-bar.el	Fri Dec 23 11:34:13 2005 +0000
+++ b/lisp/menu-bar.el	Fri Dec 23 11:36:08 2005 +0000
@@ -178,6 +178,17 @@
 (define-key menu-bar-file-menu [separator-save]
   '(menu-item "--"))
 
+(defun menu-find-file-existing ()
+  "Edit the existing file FILENAME."
+  (interactive)
+  (let* ((mustmatch (not (and (fboundp 'x-uses-old-gtk-dialog)
+			      (x-uses-old-gtk-dialog))))
+	 (filename (car (find-file-read-args "Find file: " mustmatch))))
+    (if mustmatch
+	(find-file-existing filename)
+      (find-file filename))))
+
+
 (define-key menu-bar-file-menu [kill-buffer]
   '(menu-item "Close" kill-this-buffer
 	      :enable (kill-this-buffer-enabled-p)
@@ -191,7 +202,7 @@
 	      :enable (menu-bar-non-minibuffer-window-p)
 	      :help "Read a directory, to operate on its files"))
 (define-key menu-bar-file-menu [open-file]
-  '(menu-item "Open File..." find-file-existing
+  '(menu-item "Open File..." menu-find-file-existing
 	      :enable (menu-bar-non-minibuffer-window-p)
 	      :help "Read an existing file into an Emacs buffer"))
 (define-key menu-bar-file-menu [new-file]
diff -r 5b8799d65159 -r 31f77129bc92 lisp/tool-bar.el
--- a/lisp/tool-bar.el	Fri Dec 23 11:34:13 2005 +0000
+++ b/lisp/tool-bar.el	Fri Dec 23 11:36:08 2005 +0000
@@ -233,7 +233,7 @@
   ;; might inadvertently click that button.
   ;;(tool-bar-add-item-from-menu 'save-buffers-kill-emacs "exit")
   (tool-bar-add-item-from-menu 'find-file "new")
-  (tool-bar-add-item-from-menu 'find-file-existing "open")
+  (tool-bar-add-item-from-menu 'menu-find-file-existing "open")
   (tool-bar-add-item-from-menu 'dired "diropen")
   (tool-bar-add-item-from-menu 'kill-this-buffer "close")
   (tool-bar-add-item-from-menu 'save-buffer "save" nil