diff options
| author | Glenn Morris | 2013-05-06 00:29:26 -0700 |
|---|---|---|
| committer | Glenn Morris | 2013-05-06 00:29:26 -0700 |
| commit | 7cc3af27a1bd8507ee5202714c27070f969cb5d9 (patch) | |
| tree | 7c129095d071a2e0f769bdf9eab781f9e3b8fda3 | |
| parent | 16e343d68693a1cf92a9f7cefffcf221d9950df8 (diff) | |
| download | emacs-7cc3af27a1bd8507ee5202714c27070f969cb5d9.tar.gz emacs-7cc3af27a1bd8507ee5202714c27070f969cb5d9.zip | |
* lisp/w32-fns.el (w32-charset-info-alist): Declare.
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/w32-fns.el | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9da2195fe07..d38ef5a541e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2013-05-06 Glenn Morris <rgm@gnu.org> | 1 | 2013-05-06 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * w32-fns.el (w32-charset-info-alist): Declare. | ||
| 4 | |||
| 3 | * eshell/em-cmpl.el: Simply require pcomplete; eg we use a bunch | 5 | * eshell/em-cmpl.el: Simply require pcomplete; eg we use a bunch |
| 4 | of its defcustom properties. | 6 | of its defcustom properties. |
| 5 | (eshell-cmpl-initialize): No need to load pcomplete. | 7 | (eshell-cmpl-initialize): No need to load pcomplete. |
diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el index e0d1abe94c7..44b3cfd3b1d 100644 --- a/lisp/w32-fns.el +++ b/lisp/w32-fns.el | |||
| @@ -250,6 +250,8 @@ This function is provided for backward compatibility, since | |||
| 250 | ;; Set to a system sound if you want a fancy bell. | 250 | ;; Set to a system sound if you want a fancy bell. |
| 251 | (set-message-beep nil) | 251 | (set-message-beep nil) |
| 252 | 252 | ||
| 253 | (defvar w32-charset-info-alist) ; w32font.c | ||
| 254 | |||
| 253 | (defun w32-add-charset-info (xlfd-charset windows-charset codepage) | 255 | (defun w32-add-charset-info (xlfd-charset windows-charset codepage) |
| 254 | "Function to add character sets to display with Windows fonts. | 256 | "Function to add character sets to display with Windows fonts. |
| 255 | Creates entries in `w32-charset-info-alist'. | 257 | Creates entries in `w32-charset-info-alist'. |