aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2011-06-29 20:13:35 -0700
committerGlenn Morris2011-06-29 20:13:35 -0700
commit94b9acce13573ce598bd9a73ebb273d7e200c09d (patch)
tree2b8395161fbc5827b10b8565a95758bf6542d7dd
parent1d9b46d4ccbf41f347e8595aa75d55c52731ed60 (diff)
downloademacs-94b9acce13573ce598bd9a73ebb273d7e200c09d.tar.gz
emacs-94b9acce13573ce598bd9a73ebb273d7e200c09d.zip
* lisp/w32-fns.el (w32-charset-info-alist): Declare.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/w32-fns.el2
2 files changed, 4 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 96f3b03406a..e6cf29a130b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12011-06-30 Glenn Morris <rgm@gnu.org> 12011-06-30 Glenn Morris <rgm@gnu.org>
2 2
3 * w32-fns.el (w32-charset-info-alist): Declare.
4
3 * find-dired.el (find-grep-options): Simplify. 5 * find-dired.el (find-grep-options): Simplify.
4 6
5 * term/ns-win.el (ns-set-resource): Declare. 7 * term/ns-win.el (ns-set-resource): Declare.
diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el
index a002a63e3f8..cb21d4b08c0 100644
--- a/lisp/w32-fns.el
+++ b/lisp/w32-fns.el
@@ -335,6 +335,8 @@ This function is provided for backward compatibility, since
335(global-set-key [lwindow] 'ignore) 335(global-set-key [lwindow] 'ignore)
336(global-set-key [rwindow] 'ignore) 336(global-set-key [rwindow] 'ignore)
337 337
338(defvar w32-charset-info-alist) ; w32font.c
339
338(defun w32-add-charset-info (xlfd-charset windows-charset codepage) 340(defun w32-add-charset-info (xlfd-charset windows-charset codepage)
339 "Function to add character sets to display with Windows fonts. 341 "Function to add character sets to display with Windows fonts.
340Creates entries in `w32-charset-info-alist'. 342Creates entries in `w32-charset-info-alist'.