diff options
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/menu-bar.el | 13 | ||||
| -rw-r--r-- | lisp/tool-bar.el | 2 |
3 files changed, 20 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index fa35372c657..320b6ec940f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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 --git a/lisp/menu-bar.el b/lisp/menu-bar.el index afc207bc9f0..e005fc09df6 100644 --- a/lisp/menu-bar.el +++ b/lisp/menu-bar.el @@ -178,6 +178,17 @@ A large number or nil slows down menu responsiveness." (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 @@ A large number or nil slows down menu responsiveness." :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 --git a/lisp/tool-bar.el b/lisp/tool-bar.el index c4325505ac4..15321a4ffd8 100644 --- a/lisp/tool-bar.el +++ b/lisp/tool-bar.el @@ -233,7 +233,7 @@ holds a keymap." ;; 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 |