aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2013-09-17 21:32:01 -0700
committerGlenn Morris2013-09-17 21:32:01 -0700
commit5fa89513d571eccb834632574cbfeff41fd1936f (patch)
tree1d893aa65ca4d637c23ad6fb07a5ae9f9cf5aa7b
parente843de776724c563b32aded5405fcada1a75d465 (diff)
downloademacs-5fa89513d571eccb834632574cbfeff41fd1936f.tar.gz
emacs-5fa89513d571eccb834632574cbfeff41fd1936f.zip
* term/w32-win.el (create-default-fontset): Declare.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/term/w32-win.el1
2 files changed, 3 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c88da2e5d69..b27fbea0d14 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -29,6 +29,8 @@
29 29
30 * term/x-win.el (x-select-enable-clipboard): Declare. 30 * term/x-win.el (x-select-enable-clipboard): Declare.
31 31
32 * term/w32-win.el (create-default-fontset): Declare.
33
32 * window.el (x-display-pixel-height, tool-bar-lines-needed): Declare. 34 * window.el (x-display-pixel-height, tool-bar-lines-needed): Declare.
33 (fit-frame-to-buffer): Explicit error if --without-x. 35 (fit-frame-to-buffer): Explicit error if --without-x.
34 (mouse-autoselect-window-select): Silence compiler. 36 (mouse-autoselect-window-select): Silence compiler.
diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index 55181ab7d6d..892ac9749d6 100644
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -238,6 +238,7 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.")
238 238
239(declare-function x-open-connection "w32fns.c" 239(declare-function x-open-connection "w32fns.c"
240 (display &optional xrm-string must-succeed)) 240 (display &optional xrm-string must-succeed))
241(declare-function create-default-fontset "fontset" ())
241(declare-function create-fontset-from-fontset-spec "fontset" 242(declare-function create-fontset-from-fontset-spec "fontset"
242 (fontset-spec &optional style-variant noerror)) 243 (fontset-spec &optional style-variant noerror))
243(declare-function create-fontset-from-x-resource "fontset" ()) 244(declare-function create-fontset-from-x-resource "fontset" ())