;; This file is part of GNU Emacs.
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
;; same buffer.
(setq find-file-visit-truename t)
+(declare-function x-server-version "w32fns.c" (&optional display))
+
(defun w32-version ()
"Return the MS-Windows version numbers.
The value is a list of three integers: the major and minor version
(defvar w32-quote-process-args) ;; defined in w32proc.c
(defun w32-check-shell-configuration ()
- "Check the configuration of shell variables on Windows NT/9X.
+ "Check the configuration of shell variables on Windows.
This function is invoked after loading the init files and processing
the command line arguments. It issues a warning if the user or site
has configured the shell with inappropriate settings."
(defun w32-list-locales ()
"List the name and id of all locales supported by Windows."
(interactive)
- (if (null w32-valid-locales)
- (setq w32-valid-locales (w32-get-valid-locale-ids)))
+ (when (null w32-valid-locales)
+ (setq w32-valid-locales (sort (w32-get-valid-locale-ids) #'<)))
(switch-to-buffer-other-window (get-buffer-create "*Supported Locales*"))
(erase-buffer)
(insert "LCID\tAbbrev\tFull name\n\n")
- (insert (mapconcat
- '(lambda (x)
- (format "%d\t%s\t%s"
- x
- (w32-get-locale-info x)
- (w32-get-locale-info x t)))
- w32-valid-locales "\n"))
+ (insert (decode-coding-string (mapconcat
+ (lambda (x)
+ (format "%d\t%s\t%s"
+ x
+ (w32-get-locale-info x)
+ (w32-get-locale-info x t)))
+ w32-valid-locales "\n")
+ locale-coding-system))
(insert "\n")
(goto-char (point-min)))
"Function to add character sets to display with Windows fonts.
Creates entries in `w32-charset-info-alist'.
XLFD-CHARSET is a string which will appear in the XLFD font name to
-identify the character set. WINDOWS-CHARSET is a symbol identifying
+identify the character set. WINDOWS-CHARSET is a symbol identifying
the Windows character set this maps to. For the list of possible
values, see the documentation for `w32-charset-info-alist'. CODEPAGE
can be a numeric codepage that Windows uses to display the character
set, t for Unicode output with no codepage translation or nil for 8
bit output with no translation."
(add-to-list 'w32-charset-info-alist
- (cons xlfd-charset (cons windows-charset codepage)))
- )
+ (cons xlfd-charset (cons windows-charset codepage))))
;; 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 "ms-symbol" 'w32-charset-symbol nil)
(w32-add-charset-info "ms-oem" 'w32-charset-oem 437)
(w32-add-charset-info "ms-oemlatin" 'w32-charset-oem 850)
-(if (boundp 'w32-extra-charsets-defined)
- (progn
- (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-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 "windows-1258" 'w32-charset-vietnamese 1258)
- (w32-add-charset-info "ksc5601.1992" 'w32-charset-johab 1361)
- (w32-add-charset-info "mac-roman" 'w32-charset-mac 10000)))
-(if (boundp 'w32-unicode-charset-defined)
- (progn
- (w32-add-charset-info "iso10646-1" 'w32-charset-unicode t))
- (w32-add-charset-info "iso10646-1" 'w32-charset-default t))
+(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-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-2533" 'w32-charset-thai 874)
+(w32-add-charset-info "windows-1258" 'w32-charset-vietnamese 1258)
+(w32-add-charset-info "ksc5601.1992" 'w32-charset-johab 1361)
+(w32-add-charset-info "mac-roman" 'w32-charset-mac 10000)
+(w32-add-charset-info "iso10646-1" 'w32-charset-default t)
+
;; ;; If unicode windows charset is not defined, use ansi fonts.
;; (w32-add-charset-info "iso10646-1" 'w32-charset-ansi t))