* lisp/faces.el (x-display-name): Declare (for without-x builds).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bf5303460266675e549d812e717990f1771d0d09..f259ec2b3fae9410f466ba5606aaf6ec5eb66d7c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2012-09-27  Glenn Morris  <rgm@gnu.org>
 
+       * faces.el (x-display-name): Declare (for without-x builds).
+
        * linum.el (linum-format): Don't autoload it.  Improve :type.
 
        * progmodes/tcl.el: Don't require outline when compiling.

diff --git a/lisp/faces.el b/lisp/faces.el
index 6a477e172e1951aa4cb87e53b8f62b086b76d25c..3ee859305a54ed8fb954e6902ad542a9ac92b764 100644 (file)
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1867,6 +1867,7 @@ Return nil if it has no specified face."
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (declare-function x-parse-geometry "frame.c" (string))
+(defvar x-display-name)
 
 (defun x-handle-named-frame-geometry (parameters)
   "Add geometry parameters for a named frame to parameter list PARAMETERS.