*** empty log message ***

[gnu-emacs] / lisp / w32-fns.el

diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el
index 3c643533cc19b542ab8248282a6884bdedd3c4e9..12da78fb01672967e450caf7dba0baf7a36f4131 100644 (file)
--- 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.
@@ -374,12 +359,13 @@ bit output with no translation."
                (cons xlfd-charset (cons windows-charset codepage)))
   )
 
-(w32-add-charset-info "iso8859-1" 'w32-charset-ansi 1252)
+;; The last charset we add becomes the "preferred" charset for the return
+;; value from w32-select-font etc, so list the most important charsets last.
 (w32-add-charset-info "iso8859-14" 'w32-charset-ansi  28604)
 (w32-add-charset-info "iso8859-15" 'w32-charset-ansi  28605)
-(w32-add-charset-info "jisx0208-sjis" 'w32-charset-shiftjis 932)
 (w32-add-charset-info "jisx0201-latin" 'w32-charset-shiftjis 932)
 (w32-add-charset-info "jisx0201-katakana" 'w32-charset-shiftjis 932)
+(w32-add-charset-info "jisx0208-sjis" 'w32-charset-shiftjis 932)
 (w32-add-charset-info "ksc5601.1987" 'w32-charset-hangeul 949)
 (w32-add-charset-info "big5" 'w32-charset-chinesebig5 950)
 (w32-add-charset-info "gb2312" 'w32-charset-gb2312 936)
@@ -391,22 +377,23 @@ bit output with no translation."
       (w32-add-charset-info "iso8859-2" 'w32-charset-easteurope 28592)
       (w32-add-charset-info "iso8859-3" 'w32-charset-turkish 28593)
       (w32-add-charset-info "iso8859-4" 'w32-charset-baltic 28594)
-      (w32-add-charset-info "iso8859-5" 'w32-charset-russian 28595)
       (w32-add-charset-info "iso8859-6" 'w32-charset-arabic 28596)
       (w32-add-charset-info "iso8859-7" 'w32-charset-greek 28597)
       (w32-add-charset-info "iso8859-8" 'w32-charset-hebrew 1255)
       (w32-add-charset-info "iso8859-9" 'w32-charset-turkish 1254)
       (w32-add-charset-info "iso8859-13" 'w32-charset-baltic 1257)
       (w32-add-charset-info "koi8-r" 'w32-charset-russian 20866)
+      (w32-add-charset-info "iso8859-5" 'w32-charset-russian 28595)
       (w32-add-charset-info "tis620" 'w32-charset-thai 874)
       (w32-add-charset-info "ksc5601.1992" 'w32-charset-johab 1361)
       (w32-add-charset-info "mac" 'w32-charset-mac nil)))
 (if (boundp 'w32-unicode-charset-defined)
     (progn
-      (w32-add-charset-info "iso10646-1" 'w32-charset-unicode t)
-      (w32-add-charset-info "unicode" 'w32-charset-unicode t))
+      (w32-add-charset-info "unicode" 'w32-charset-unicode t)
+      (w32-add-charset-info "iso10646-1" 'w32-charset-unicode t))
   ;; If unicode windows charset is not defined, use ansi fonts.
   (w32-add-charset-info "iso10646-1" 'w32-charset-ansi t))
+(w32-add-charset-info "iso8859-1" 'w32-charset-ansi 1252)
 
 (make-obsolete-variable 'w32-enable-italics
                         'w32-enable-synthesized-fonts "21.1")