From 257ae3a60a40f646e9fc2a5ebbd7165ccb57268b Mon Sep 17 00:00:00 2001 From: Miles Bader Date: Mon, 20 May 2002 04:40:53 +0000 Subject: [PATCH] (find-file-read-args): Don't trash existing value of `minibuffer-setup-hook', just add our hook to it. --- lisp/ChangeLog | 19 ++++++++++++------- lisp/files.el | 13 ++++++++----- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b3340c730ee..b380603e0cf 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2002-05-20 Miles Bader + + * files.el (find-file-read-args): Don't trash existing value of + `minibuffer-setup-hook', just add our hook to it. + 2002-05-19 Markus Rost * international/ucs-tables.el (unify-8859-on-encoding-mode) @@ -230,7 +235,7 @@ (occur-engine): If there are no more matches, then finish searching the current buffer. -2002-05-12 Pavel Jan,Bm(Bk +2002-05-12 Pavel Jan,Am(Bk * net/ange-ftp.el (ange-ftp-try-passive-mode) (ange-ftp-passive-host-alist): Change :version attributes to be @@ -272,7 +277,7 @@ * subr.el (functionp): Catch errors in indirect-function. -2002-05-12 Pavel Jan,Bm(Bk +2002-05-12 Pavel Jan,Am(Bk * net/ldap.el (ldap-search-internal): Unfold folded lines before parsing. @@ -355,7 +360,7 @@ * wid-edit.el (checkbox): New check-mark image. -2002-05-08 Pavel Jan,Bm(Bk +2002-05-08 Pavel Jan,Am(Bk * filesets.el (filesets-running-xemacs): Fix last change. @@ -375,7 +380,7 @@ (filesets-menu-path, filesets-menu-before, filesets-menu-in-menu): Defvar them to nil if running in Emacs. -2002-05-08 Pavel Jan,Bm(Bk +2002-05-08 Pavel Jan,Am(Bk * textmodes/flyspell.el (make-flyspell-overlay): Add help text to flyspell overlays. @@ -630,7 +635,7 @@ Only interpret delete-selection property if mark-active. (cua-mode): Fixed require in defcustom. -2002-05-01 Pavel Jan,Bm(Bk +2002-05-01 Pavel Jan,Am(Bk * calendar/cal-menu.el (cal-menu-x-popup-menu): Fix argument of error call. @@ -765,7 +770,7 @@ * language/viet-util.el: Update Commentary section. -2002-04-29 Pavel Jan,Bm(Bk +2002-04-29 Pavel Jan,Am(Bk * filesets.el (filesets-data): Doc fix. (filesets-running-xemacs): Define even when compiling. @@ -830,7 +835,7 @@ * replace.el (occur-revert-arguments): Renamed from occur-revert-properties. All uses changed. -2002-04-28 Pavel Jan,Bm(Bk +2002-04-28 Pavel Jan,Am(Bk * recentf.el (recentf-menu-before): Use string to specify path in the menu. diff --git a/lisp/files.el b/lisp/files.el index 2feadc8c121..9169ae9193b 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -773,12 +773,15 @@ documentation for additional customization information." (list (let ((find-file-default (and buffer-file-name (abbreviate-file-name buffer-file-name))) + (munge-default-fun + (lambda () + (setq minibuffer-default find-file-default) + ;; Clear out this hook so it does not interfere + ;; with any recursive minibuffer usage. + (pop minibuffer-setup-hook))) (minibuffer-setup-hook - '((lambda () - (setq minibuffer-default find-file-default) - ;; Clear out this hook so it does not interfere - ;; with any recursive minibuffer usage. - (setq minibuffer-setup-hook nil))))) + minibuffer-setup-hook)) + (add-hook 'minibuffer-setup-hook munge-default-fun) (read-file-name prompt nil default-directory)) current-prefix-arg)) -- 2.39.2