/[emacs]/emacs/lisp/files.el
ViewVC logotype

Diff of /emacs/lisp/files.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.554 by kfstorm, Sun Mar 17 20:30:19 2002 UTC revision 1.555 by rms, Mon Mar 18 04:30:45 2002 UTC
# Line 3538  and `list-directory-verbose-switches'." Line 3538  and `list-directory-verbose-switches'."
3538                                         nil default-directory nil)                                         nil default-directory nil)
3539                         pfx)))                         pfx)))
3540    (let ((switches (if verbose list-directory-verbose-switches    (let ((switches (if verbose list-directory-verbose-switches
3541                      list-directory-brief-switches)))                      list-directory-brief-switches))
3542            buffer)
3543      (or dirname (setq dirname default-directory))      (or dirname (setq dirname default-directory))
3544      (setq dirname (expand-file-name dirname))      (setq dirname (expand-file-name dirname))
3545      (with-output-to-temp-buffer "*Directory*"      (with-output-to-temp-buffer "*Directory*"
3546          (setq buffer standard-output)
3547        (buffer-disable-undo standard-output)        (buffer-disable-undo standard-output)
3548        (princ "Directory ")        (princ "Directory ")
3549        (princ dirname)        (princ dirname)
3550        (terpri)        (terpri)
3551        (save-excursion        (save-excursion
3552          (set-buffer "*Directory*")          (set-buffer "*Directory*")
         (setq default-directory  
               (if (file-directory-p dirname)  
                   (file-name-as-directory dirname)  
                 (file-name-directory dirname)))  
3553          (let ((wildcard (not (file-directory-p dirname))))          (let ((wildcard (not (file-directory-p dirname))))
3554            (insert-directory dirname switches wildcard (not wildcard)))))))            (insert-directory dirname switches wildcard (not wildcard)))))
3555        ;; Finishing with-output-to-temp-buffer seems to clobber default-directory.
3556        (with-current-buffer buffer
3557          (setq default-directory
3558                (if (file-directory-p dirname)
3559                    (file-name-as-directory dirname)
3560                  (file-name-directory dirname))))))
3561    
3562  (defun shell-quote-wildcard-pattern (pattern)  (defun shell-quote-wildcard-pattern (pattern)
3563    "Quote characters special to the shell in PATTERN, leave wildcards alone.    "Quote characters special to the shell in PATTERN, leave wildcards alone.

Legend:
Removed from v.1.554  
changed lines
  Added in v.1.555

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26