(make-auto-save-file-name): Remove replacement function.

3 files changed, 9 insertions, 34 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 21ae3139609..c01a5ac0425 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2002-03-06  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* files.el (make-auto-save-file-name): Make sure the produced file
+	name does not contain characters that are invalid for DOS/Windows
+	filesystems.
+
+	* dos-fns.el, w32-fns.el: (make-auto-save-file-name): Remove
+	replacement functions.
+
 2002-03-06  Gerd Moellmann  <gerd@gnu.org>
 
 	* font-lock.el (lisp-font-lock-keywords-2): Highlight keywords of
diff --git a/lisp/dos-fns.el b/lisp/dos-fns.el
index 4b91cdf7a1b..1a979a80d73 100644
--- a/lisp/dos-fns.el
+++ b/lisp/dos-fns.el
@@ -180,25 +180,6 @@ with a definition that really does change some file names."
 		    (dos-8+3-filename dir))
 		  string))))))
 
-;; Make sure auto-save file names don't contain characters invalid for
-;; the underlying filesystem.  This is particularly annoying with
-;; `compose-mail's *mail* buffers: `*' is not allowed in file names on
-;; DOS/Windows, so Emacs bitches on you each time it tries to autosave
-;; the message being composed.
-(fset 'original-make-auto-save-file-name
-      (symbol-function 'make-auto-save-file-name))
-
-(defun make-auto-save-file-name ()
-  "Return file name to use for auto-saves of current buffer.
-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'."
-  (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))))
-
 ;; See dos-vars.el for defcustom.
 (defvar msdos-shells)
 
diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el
index 3c643533cc1..6a8037ceac0 100644
--- a/lisp/w32-fns.el
+++ b/lisp/w32-fns.el
@@ -227,21 +227,6 @@ You should set this to t when using a non-system shell.\n\n"))))
 ;	     (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
-      (symbol-function 'make-auto-save-file-name))
-
-(defun make-auto-save-file-name ()
-  "Return file name to use for auto-saves of current buffer.
-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'."
-  (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.
 This function's standard definition is trivial; it just returns the argument.