X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/341dd15a7bd9d0b4adff846e94289b3e1877eed1..05756f213fcfa16a02a780e17fff16bd4cbb1aa4:/lisp/w32-fns.el diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el index a0558b7dcf..379dd63eb1 100644 --- a/lisp/w32-fns.el +++ b/lisp/w32-fns.el @@ -1,17 +1,17 @@ ;;; w32-fns.el --- Lisp routines for Windows NT ;; Copyright (C) 1994, 2001, 2002, 2003, 2004, -;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +;; 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. ;; Author: Geoff Voelker ;; Keywords: internal ;; 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 @@ -19,9 +19,7 @@ ;; 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 . ;;; Commentary: @@ -74,13 +72,12 @@ (declare-function w32-get-valid-locale-ids "w32proc.c") (declare-function w32-set-clipboard-data "w32select.c") -;; Ignore case on file-name completion -(setq completion-ignore-case t) - ;; Map all versions of a filename (8.3, longname, mixed case) to the ;; 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 @@ -106,7 +103,7 @@ That includes all Windows systems except for 9X/Me." w32-system-shells))) (defun w32-shell-dos-semantics () - "Return non-nil if the interactive shell being used expects MSDOS shell semantics." + "Return non-nil if the interactive shell being used expects MS-DOS shell semantics." (or (w32-system-shell-p (w32-shell-name)) (and (member (downcase (file-name-nondirectory (w32-shell-name))) '("cmdproxy" "cmdproxy.exe")) @@ -115,7 +112,7 @@ That includes all Windows systems except for 9X/Me." (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." @@ -220,21 +217,15 @@ You should set this to t when using a non-system shell.\n\n")))) (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))) - (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 "\n") - (goto-char (point-min))) - + (when (null w32-valid-locales) + (setq w32-valid-locales (sort (w32-get-valid-locale-ids) #'<))) + (with-output-to-temp-buffer "*Supported Locales*" + (princ "LCID\tAbbrev\tFull name\n\n") + (dolist (locale w32-valid-locales) + (princ (format "%d\t%s\t%s\n" + locale + (w32-get-locale-info locale) + (w32-get-locale-info locale t)))))) ;;; Setup Info-default-directory-list to include the info directory ;;; near where Emacs executable was installed. We used to set INFOPATH, @@ -354,15 +345,14 @@ This function is provided for backward compatibility, since "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. @@ -379,25 +369,22 @@ bit output with no translation." (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 "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))