[Emacs-diffs] Changes to emacs/lisp/files.el

[Miles Bader]

Index: emacs/lisp/files.el
diff -c emacs/lisp/files.el:1.574 emacs/lisp/files.el:1.575
*** emacs/lisp/files.el:1.574   Sun May 19 11:55:04 2002
--- emacs/lisp/files.el Mon May 20 00:40:40 2002
***************
*** 773,784 ****
    (list (let ((find-file-default
               (and buffer-file-name
                    (abbreviate-file-name buffer-file-name)))
              (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)))))
          (read-file-name prompt nil default-directory))
        current-prefix-arg))
  
--- 773,787 ----
    (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
!              minibuffer-setup-hook))
!         (add-hook 'minibuffer-setup-hook munge-default-fun)
          (read-file-name prompt nil default-directory))
        current-prefix-arg))