Add some compiler declarations, for builds without X.

3 files changed, 36 insertions, 2 deletions

diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index d7e0c580c5..6ac2aab617 100644
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -185,6 +185,8 @@ the last file dropped is selected."
 	  (concat x-command-line-resources "\n" (car x-invocation-args))))
   (setq x-invocation-args (cdr x-invocation-args)))
 
+(declare-function x-parse-geometry "frame.c" (string))
+
 (defun x-handle-geometry (switch)
   "Handle the \"-geometry\" SWITCH."
   (let* ((geo (x-parse-geometry (car x-invocation-args)))
@@ -211,6 +213,8 @@ the last file dropped is selected."
 		      (if top (list top)))))
     (setq x-invocation-args (cdr x-invocation-args))))
 
+(defvar x-resource-name)
+
 (defun x-handle-name-switch (switch)
   "Handle the \"-name\" SWITCH."
 ;; Handle the -name option.  Set the variable x-resource-name
@@ -417,6 +421,7 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.")
   "Report an error when a suspend is attempted."
   (error "Suspending an Emacs running under W32 makes no sense"))
 
+(declare-function generate-fontset-menu "fontset" ())
 
 (defun mouse-set-font (&rest fonts)
   "Select an Emacs font from a list of known good fonts and fontsets.
@@ -451,6 +456,8 @@ pop-up menu are unaffected by `w32-list-proportional-fonts')."
 	(if (null font)
 	    (error "Font not found")))))
 
+(defvar image-library-alist)
+
 ;;; Set default known names for image libraries
 (setq image-library-alist
       '((xpm "libxpm.dll" "xpm4.dll" "libXpm-nox4.dll")
@@ -468,6 +475,19 @@ pop-up menu are unaffected by `w32-list-proportional-fonts')."
 (defvar w32-initialized nil
   "Non-nil if the w32 window system has been initialized.")
 
+(declare-function x-open-connection "w32fns.c"
+                  (display &optional xrm-string must-succeed))
+
+(declare-function setup-default-fontset "fontset" ())
+(declare-function set-fontset-font "fontset.c"
+                  (name target font-spec &optional frame add))
+(declare-function setup-default-fontset "fontset" ())
+(declare-function create-fontset-from-fontset-spec "fontset"
+                  (fontset-spec &optional style-variant noerror))
+(declare-function create-fontset-from-x-resource "fontset" ())
+(declare-function x-get-resource "frame.c"
+                  (attribute class &optional component subclass))
+
 (defun w32-initialize-window-system ()
   "Initialize Emacs for W32 GUI frames."
 
diff --git a/lisp/term/w32console.el b/lisp/term/w32console.el
index 22fe44fb57..21bca078dd 100644
--- a/lisp/term/w32console.el
+++ b/lisp/term/w32console.el
@@ -45,6 +45,8 @@
     ("white"         15 65535 65535 65535))
 "A list of VGA console colors, their indices and 16-bit RGB values.")
 
+(declare-function x-setup-function-keys "w32-fns" (frame))
+
 (defun terminal-init-w32console ()
   "Terminal initialization function for w32 console."
   ;; Share function key initialization with w32 gui frames
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index 593df58cca..fed2081d66 100644
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -1,7 +1,7 @@
 ;;; x-win.el --- parse relevant switches and set up for X  -*-coding: iso-2022-7bit;-*-
 
-;; Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+;;   2008 Free Software Foundation, Inc.
 
 ;; Author: FSF
 ;; Keywords: terminals, i18n
@@ -151,6 +151,8 @@
 	  (concat x-command-line-resources "\n" (car x-invocation-args))))
   (setq x-invocation-args (cdr x-invocation-args)))
 
+(declare-function x-parse-geometry "frame.c" (string))
+
 ;; Handle the geometry option
 (defun x-handle-geometry (switch)
   (let* ((geo (x-parse-geometry (car x-invocation-args)))
@@ -177,6 +179,8 @@
 		      (if top (list top)))))
     (setq x-invocation-args (cdr x-invocation-args))))
 
+(defvar x-resource-name)
+
 ;; Handle the -name option.  Set the variable x-resource-name
 ;; to the option's operand; set the name of
 ;; the initial frame, too.
@@ -1684,6 +1688,8 @@ The value nil is the same as this list:
 	(kill-new clipboard-text))
     (yank)))
 
+(declare-function accelerate-menu "xmenu.c" (&optional frame) t)
+
 (defun x-menu-bar-open (&optional frame)
   "Open the menu bar if `menu-bar-mode' is on. otherwise call `tmm-menubar'."
   (interactive "i")
@@ -1699,6 +1705,12 @@ The value nil is the same as this list:
 (defvar x-initialized nil
   "Non-nil if the X window system has been initialized.")
 
+(declare-function x-open-connection "xfns.c"
+		  (display &optional xrm-string must-succeed))
+(declare-function x-server-max-request-size "xfns.c" (&optional terminal))
+(declare-function x-get-resource "frame.c"
+		  (attribute class &optional component subclass))
+
 (defun x-initialize-window-system ()
   "Initialize Emacs for X frames and open the first connection to an X server."
   ;; Make sure we have a valid resource name.