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

[Richard M. Stallman]

Index: emacs/lisp/files.el
diff -c emacs/lisp/files.el:1.554 emacs/lisp/files.el:1.555
*** emacs/lisp/files.el:1.554   Sun Mar 17 15:30:19 2002
--- emacs/lisp/files.el Sun Mar 17 23:30:45 2002
***************
*** 3538,3559 ****
                                       nil default-directory nil)
                       pfx)))
    (let ((switches (if verbose list-directory-verbose-switches
!                   list-directory-brief-switches)))
      (or dirname (setq dirname default-directory))
      (setq dirname (expand-file-name dirname))
      (with-output-to-temp-buffer "*Directory*"
        (buffer-disable-undo standard-output)
        (princ "Directory ")
        (princ dirname)
        (terpri)
        (save-excursion
        (set-buffer "*Directory*")
-       (setq default-directory
-             (if (file-directory-p dirname)
-                 (file-name-as-directory dirname)
-               (file-name-directory dirname)))
        (let ((wildcard (not (file-directory-p dirname))))
!         (insert-directory dirname switches wildcard (not wildcard)))))))
  
  (defun shell-quote-wildcard-pattern (pattern)
    "Quote characters special to the shell in PATTERN, leave wildcards alone.
--- 3538,3563 ----
                                       nil default-directory nil)
                       pfx)))
    (let ((switches (if verbose list-directory-verbose-switches
!                   list-directory-brief-switches))
!       buffer)
      (or dirname (setq dirname default-directory))
      (setq dirname (expand-file-name dirname))
      (with-output-to-temp-buffer "*Directory*"
+       (setq buffer standard-output)
        (buffer-disable-undo standard-output)
        (princ "Directory ")
        (princ dirname)
        (terpri)
        (save-excursion
        (set-buffer "*Directory*")
        (let ((wildcard (not (file-directory-p dirname))))
!         (insert-directory dirname switches wildcard (not wildcard)))))
!     ;; Finishing with-output-to-temp-buffer seems to clobber 
default-directory.
!     (with-current-buffer buffer
!       (setq default-directory
!           (if (file-directory-p dirname)
!               (file-name-as-directory dirname)
!             (file-name-directory dirname))))))
  
  (defun shell-quote-wildcard-pattern (pattern)
    "Quote characters special to the shell in PATTERN, leave wildcards alone.