(custom-face-value-create): If face name doesn't end with "face", add

[bpt/emacs.git] / lisp / w32-fns.el

diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el
index d8a7858..0f30dd6 100644 (file)
--- a/lisp/w32-fns.el
+++ b/lisp/w32-fns.el
@@ -223,10 +223,10 @@ You should set this to t when using a non-system shell.\n\n"))))
 ;;; source-directory, set it to something that is a reasonable approximation
 ;;; on the user's machine.
 
-(add-hook 'before-init-hook 
-         '(lambda ()
-            (setq source-directory (file-name-as-directory 
-                                    (expand-file-name ".." exec-directory)))))
+;(add-hook 'before-init-hook 
+;        '(lambda ()
+;           (setq source-directory (file-name-as-directory 
+;                                   (expand-file-name ".." exec-directory)))))
 
 ;; Avoid creating auto-save file names containing invalid characters.
 (fset 'original-make-auto-save-file-name
@@ -237,7 +237,11 @@ You should set this to t when using a non-system shell.\n\n"))))
 Does not consider `auto-save-visited-file-name' as that variable is checked
 before calling this function.  You can redefine this for customization.
 See also `auto-save-file-name-p'."
-  (convert-standard-filename (original-make-auto-save-file-name)))
+  (let ((filename (original-make-auto-save-file-name)))
+    ;; Don't modify remote (ange-ftp) filenames
+    (if (string-match "^/\\w+@[-A-Za-z0-9._]+:" filename)
+       filename
+      (convert-standard-filename filename))))
 
 (defun convert-standard-filename (filename)
   "Convert a standard file's name to something suitable for the current OS.