From e740f9d245b007e51fcc706338a4a1ac450c8307 Mon Sep 17 00:00:00 2001
From: Glenn Morris <rgm@gnu.org>
Date: Tue, 17 Sep 2013 19:50:04 -0700
Subject: [PATCH] Silence some --without-x compilation warnings

* custom.el (x-get-resource): Declare.

* frame.el (x-display-grayscale-p): Declare.

* simple.el (font-info): Declare.

* window.el (x-display-pixel-height, tool-bar-lines-needed): Declare.
(fit-frame-to-buffer): Explicit error if --without-x.
(mouse-autoselect-window-select): Silence compiler.
---
 lisp/ChangeLog | 10 ++++++++++
 lisp/custom.el |  7 +++++--
 lisp/frame.el  |  3 +++
 lisp/simple.el |  3 +++
 lisp/window.el | 10 +++++++---
 5 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5b911a503b8..c6940ca600a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,15 @@
 2013-09-18  Glenn Morris  <rgm@gnu.org>
 
+	* custom.el (x-get-resource): Declare.
+
+	* frame.el (x-display-grayscale-p): Declare.
+
+	* simple.el (font-info): Declare.
+
+	* window.el (x-display-pixel-height, tool-bar-lines-needed): Declare.
+	(fit-frame-to-buffer): Explicit error if --without-x.
+	(mouse-autoselect-window-select): Silence compiler.
+
 	* dframe.el (x-sensitive-text-pointer-shape, x-pointer-shape): Declare.
 
 	* eshell/em-cmpl.el (eshell-complete-parse-arguments):
diff --git a/lisp/custom.el b/lisp/custom.el
index 3db34e4d1fb..d721198da0b 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -1,7 +1,6 @@
 ;;; custom.el --- tools for declaring and initializing options
 ;;
-;; Copyright (C) 1996-1997, 1999, 2001-2013 Free Software Foundation,
-;; Inc.
+;; Copyright (C) 1996-1997, 1999, 2001-2013 Free Software Foundation, Inc.
 ;;
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Maintainer: FSF
@@ -1416,6 +1415,10 @@ See `custom-enabled-themes' for a list of enabled themes."
       (setq custom-enabled-themes
 	    (delq theme custom-enabled-themes)))))
 
+;; Only used if window-system not null.
+(declare-function x-get-resource "frame.c"
+		  (attribute class &optional component subclass))
+
 (defun custom--frame-color-default (frame attribute resource-attr resource-class
 					  tty-default x-default)
   (let ((col (face-attribute 'default attribute t)))
diff --git a/lisp/frame.el b/lisp/frame.el
index 74149a8dc01..1980e639283 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -889,6 +889,9 @@ e.g. (mapc 'frame-set-background-mode (frame-list))."
 (declare-function x-get-resource "frame.c"
 		  (attribute class &optional component subclass))
 
+;; Only used if window-system is not null.
+(declare-function x-display-grayscale-p "xfns.c" (&optional terminal))
+
 (defvar inhibit-frame-set-background-mode nil)
 
 (defun frame-set-background-mode (frame &optional keep-face-specs)
diff --git a/lisp/simple.el b/lisp/simple.el
index 34774712437..bf531de8ae4 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -4714,6 +4714,9 @@ lines."
   :group 'editing-basics
   :version "23.1")
 
+;; Only used if display-graphic-p.
+(declare-function font-info "font.c" (name &optional frame))
+
 (defun default-font-height ()
   "Return the height in pixels of the current buffer's default face font."
   (let ((default-font (face-font 'default)))
diff --git a/lisp/window.el b/lisp/window.el
index 14e9f6bc128..e4959da3d21 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -1,7 +1,6 @@
 ;;; window.el --- GNU Emacs window commands aside from those written in C
 
-;; Copyright (C) 1985, 1989, 1992-1994, 2000-2013 Free Software
-;; Foundation, Inc.
+;; Copyright (C) 1985, 1989, 1992-1994, 2000-2013 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
@@ -6153,6 +6152,9 @@ reduce this.  If it is thicker, you might want to increase this."
   :version "24.3"
   :group 'windows)
 
+(declare-function x-display-pixel-height "xfns.c" (&optional terminal))
+(declare-function tool-bar-lines-needed "xdisp.c" (&optional frame))
+
 (defun fit-frame-to-buffer (&optional frame max-height min-height)
   "Adjust height of FRAME to display its buffer contents exactly.
 FRAME can be any live frame and defaults to the selected one.
@@ -6163,6 +6165,8 @@ top line of FRAME, minus `fit-frame-to-buffer-bottom-margin'.
 Optional argument MIN-HEIGHT specifies the minimum height of FRAME.
 The default corresponds to `window-min-height'."
   (interactive)
+  (or (fboundp 'x-display-pixel-height)
+      (user-error "Cannot resize frame in non-graphic Emacs"))
   (setq frame (window-normalize-frame frame))
   (let* ((root (frame-root-window frame))
 	 (frame-min-height
@@ -6685,7 +6689,7 @@ is active.  This function is run by `mouse-autoselect-window-timer'."
 	    (window-at (cadr mouse-position) (cddr mouse-position)
 		       (car mouse-position)))))
      (cond
-      ((or (menu-or-popup-active-p)
+      ((or (and (fboundp 'menu-or-popup-active-p) (menu-or-popup-active-p))
 	   (and window
 		(let ((coords (coordinates-in-window-p
 			       (cdr mouse-position) window)))
-- 
2.11.4.GIT