(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 bcfa817..0f30dd6 100644 (file)
--- a/lisp/w32-fns.el
+++ b/lisp/w32-fns.el
@@ -52,7 +52,7 @@
   "List of strings recognized as Windows NT/9X system shells.")
 
 (defun w32-using-nt ()
-  "Return t if literally running on Windows NT (i.e., not Windows 9X)."
+  "Return non-nil if literally running on Windows NT (i.e., not Windows 9X)."
   (and (eq system-type 'windows-nt) (getenv "SystemRoot")))
 
 (defun w32-shell-name ()
@@ -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.
@@ -345,4 +349,58 @@ CODING-SYSTEM, use \\[list-coding-systems]."
     ("black"          0     0     0     0))
 "A list of VGA console colors, their indices and 16-bit RGB values.")
 
+;; w32term.c sets this to nil, but if it has been overridden before we
+;; get here, we should not try to set it again.
+(if (not w32-charset-info-alist)
+    (progn (setq w32-charset-info-alist
+                 '(("iso8859-1" . (w32-charset-ansi . 1252))
+                   ("jisx0208-sjis" . (w32-charset-shiftjis . 932))
+                   ("jisx0201-latin" . (w32-charset-shiftjis . 932))
+                   ("jisx0201-katakana" . (w32-charset-shiftjis . 932))
+                   ("ksc5601.1987" . (w32-charset-hangul . 949))
+                   ("big5" . (w32-charset-chinesebig5 . 950))
+                   ("gb2312" . (w32-charset-gb2312 . 936))
+                   ("ms-symbol" . (w32-charset-symbol . nil))
+                   ("ms-oem" . (w32-charset-oem . 437))
+                   ("ms-oemlatin" . (w32-charset-oem . 850))))
+           (if (boundp 'w32-extra-charsets-defined)
+               (progn
+                 (add-to-list 'w32-charset-info-alist
+                  '("iso8859-2" . (w32-charset-easteurope . 28592)))
+                 (add-to-list 'w32-charset-info-alist
+                  '("iso8859-3" . (w32-charset-turkish . 28593)))
+                 (add-to-list 'w32-charset-info-alist
+                  '("iso8859-4" . (w32-charset-baltic . 28594)))
+                 (add-to-list 'w32-charset-info-alist
+                  '("iso8859-5" . (w32-charset-russian . 28595)))
+                 (add-to-list 'w32-charset-info-alist
+                  '("iso8859-6" . (w32-charset-arabic . 28596)))
+                 (add-to-list 'w32-charset-info-alist
+                  '("iso8859-7" . (w32-charset-greek . 28597)))
+                 (add-to-list 'w32-charset-info-alist
+                  '("iso8859-8" . (w32-charset-hebrew . 1255)))
+                 (add-to-list 'w32-charset-info-alist
+                  '("iso8859-9" . (w32-charset-turkish . 1254)))
+                 (add-to-list 'w32-charset-info-alist
+                  '("iso8859-13" . (w32-charset-baltic . 1257)))
+                 (add-to-list 'w32-charset-info-alist
+                  '("koi8-r" . (w32-charset-russian . 20866)))
+                 (add-to-list 'w32-charset-info-alist
+                  '("tis620" . (w32-charset-thai . 874)))
+                 (add-to-list 'w32-charset-info-alist
+                  '("ksc5601.1992" . (w32-charset-johab . 1361)))
+                 (add-to-list 'w32-charset-info-alist
+                  '("mac" . (w32-charset-mac . nil))))))
+           (if (boundp 'w32-unicode-charset-defined)
+               (progn
+                 (add-to-list 'w32-charset-info-alist
+                  '("iso10646" . (w32-charset-unicode . t)))
+                 (add-to-list 'w32-charset-info-alist
+                  '("unicode" . (w32-charset-unicode . t))))))
+
+(make-obsolete-variable 'w32-enable-italics 'w32-enable-synthesized-fonts)
+(make-obsolete-variable 'w32-charset-to-codepage-alist
+    "w32-charset-to-codepage-alist has been replaced by the more extensive
+w32-charset-info-alist")
+
 ;;; w32-fns.el ends here