diff options
| author | Juanma Barranquero | 2008-10-16 15:28:29 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2008-10-16 15:28:29 +0000 |
| commit | 72ab66ebe39b5397539a054d042f592e44ef9ab3 (patch) | |
| tree | 0e3c7587639f7d96a0e8c6bee461f5dc8cf304f2 | |
| parent | 15bcf456060c9021ed159861cfb03a318d7c6871 (diff) | |
| download | emacs-72ab66ebe39b5397539a054d042f592e44ef9ab3.tar.gz emacs-72ab66ebe39b5397539a054d042f592e44ef9ab3.zip | |
* w32-fns.el (w32-check-shell-configuration): Doc fix.
(w32-add-charset-info): Fix typo in docstring.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/w32-fns.el | 7 |
2 files changed, 8 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5f37792e670..f3e6fe7c2a9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2008-10-16 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * w32-fns.el (w32-check-shell-configuration): Doc fix. | ||
| 4 | (w32-add-charset-info): Fix typo in docstring. | ||
| 5 | |||
| 1 | 2008-10-16 Teodor Zlatanov <tzz@lifelogs.com> | 6 | 2008-10-16 Teodor Zlatanov <tzz@lifelogs.com> |
| 2 | 7 | ||
| 3 | * international/mule-conf.el: Removed `utf8' and `UTF8' aliases | 8 | * international/mule-conf.el: Removed `utf8' and `UTF8' aliases |
diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el index 1c449d468f2..8a8ef7f1739 100644 --- a/lisp/w32-fns.el +++ b/lisp/w32-fns.el | |||
| @@ -112,7 +112,7 @@ That includes all Windows systems except for 9X/Me." | |||
| 112 | (defvar w32-quote-process-args) ;; defined in w32proc.c | 112 | (defvar w32-quote-process-args) ;; defined in w32proc.c |
| 113 | 113 | ||
| 114 | (defun w32-check-shell-configuration () | 114 | (defun w32-check-shell-configuration () |
| 115 | "Check the configuration of shell variables on Windows NT/9X. | 115 | "Check the configuration of shell variables on Windows. |
| 116 | This function is invoked after loading the init files and processing | 116 | This function is invoked after loading the init files and processing |
| 117 | the command line arguments. It issues a warning if the user or site | 117 | the command line arguments. It issues a warning if the user or site |
| 118 | has configured the shell with inappropriate settings." | 118 | has configured the shell with inappropriate settings." |
| @@ -351,15 +351,14 @@ This function is provided for backward compatibility, since | |||
| 351 | "Function to add character sets to display with Windows fonts. | 351 | "Function to add character sets to display with Windows fonts. |
| 352 | Creates entries in `w32-charset-info-alist'. | 352 | Creates entries in `w32-charset-info-alist'. |
| 353 | XLFD-CHARSET is a string which will appear in the XLFD font name to | 353 | XLFD-CHARSET is a string which will appear in the XLFD font name to |
| 354 | identify the character set. WINDOWS-CHARSET is a symbol identifying | 354 | identify the character set. WINDOWS-CHARSET is a symbol identifying |
| 355 | the Windows character set this maps to. For the list of possible | 355 | the Windows character set this maps to. For the list of possible |
| 356 | values, see the documentation for `w32-charset-info-alist'. CODEPAGE | 356 | values, see the documentation for `w32-charset-info-alist'. CODEPAGE |
| 357 | can be a numeric codepage that Windows uses to display the character | 357 | can be a numeric codepage that Windows uses to display the character |
| 358 | set, t for Unicode output with no codepage translation or nil for 8 | 358 | set, t for Unicode output with no codepage translation or nil for 8 |
| 359 | bit output with no translation." | 359 | bit output with no translation." |
| 360 | (add-to-list 'w32-charset-info-alist | 360 | (add-to-list 'w32-charset-info-alist |
| 361 | (cons xlfd-charset (cons windows-charset codepage))) | 361 | (cons xlfd-charset (cons windows-charset codepage)))) |
| 362 | ) | ||
| 363 | 362 | ||
| 364 | ;; The last charset we add becomes the "preferred" charset for the return | 363 | ;; The last charset we add becomes the "preferred" charset for the return |
| 365 | ;; value from w32-select-font etc, so list the most important charsets last. | 364 | ;; value from w32-select-font etc, so list the most important charsets last. |