procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(recover-file): Call insert-directory instead of

Browse source 
invoking `ls' directly.
This commit is contained in:
Eli Zaretskii 2000-08-10 10:44:49 +00:00
parent 3db4b71989
commit 98532b1215
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2000-08-10 Eli Zaretskii <eliz@is.elta.co.il>
* files.el (recover-file): Call insert-directory instead of
invoking `ls' directly.
2000-08-10 Miles Bader <miles@gnu.org>
* comint.el (comint-highlight-prompt, comint-highlight-prompt-face)

15
lisp/files.el
View file

@ -3030,12 +3030,15 @@ non-nil, it is called instead of rereading visited file contents."
(not (file-exists-p file-name)))
(error "Auto-save file %s not current" file-name))
((save-window-excursion
(if (not (memq system-type '(vax-vms windows-nt)))
(with-output-to-temp-buffer "*Directory*"
(buffer-disable-undo standard-output)
(call-process "ls" nil standard-output nil
(if (file-symlink-p file) "-lL" "-l")
file file-name)))
(with-output-to-temp-buffer "*Directory*"
(buffer-disable-undo standard-output)
(save-excursion
(let ((switches dired-listing-switches))
(if (file-symlink-p file)
(setq switches (concat switches "L")))
(set-buffer standard-output)
(insert-directory file switches)
(insert-directory file-name switches))))
(yes-or-no-p (format "Recover auto save file %s? " file-name)))
(switch-to-buffer (find-file-noselect file t))
(let ((buffer-read-only nil)