X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Ffiles.el;h=e3760a7965d4f6c6c4c5fc4c8dde4db1de19dc0c;hb=ea1ea793fe6e244ef5555ed983423a204101af13;hp=d8aa8171c22356c45ff547f6644cae1a8c5a0e2d;hpb=399b9f4466f37412410de8ec4a08e3dc5504ad10;p=chise%2Fxemacs-chise.git diff --git a/lisp/files.el b/lisp/files.el index d8aa817..e3760a7 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -1272,7 +1272,7 @@ When checking `inhibit-first-line-modes-regexps', we first discard from the end of the file name anything that matches one of these regexps.") (defvar user-init-file - "" ; set by command-line + nil ; set by command-line "File name including directory of user's initialization file.") (defun set-auto-mode (&optional just-from-file-name) @@ -2753,11 +2753,12 @@ 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 - (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)) + (if (not (eq system-type '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))) (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))