From: Chong Yidong <cyd@stupidchicken.com>
Date: Thu, 7 May 2009 00:03:42 +0000 (+0000)
Subject: * faces.el (x-handle-named-frame-geometry): Ignore errors from
X-Git-Tag: emacs-pretest-23.0.94~100
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8c61dd01c0960de0d70323257832cf0aaded356b;p=emacs.git

* faces.el (x-handle-named-frame-geometry): Ignore errors from
x-get-resource due to not yet opened X connection.  This is a
temporary workaround for Bug#3194.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b4e87672e34..155e7049603 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2009-05-07  Chong Yidong  <cyd@stupidchicken.com>
+
+	* faces.el (x-handle-named-frame-geometry): Ignore errors from
+	x-get-resource due to not yet opened X connection.  This is a
+	temporary workaround for Bug#3194.
+
 2009-05-05  Bob Rogers  <rogers-emacs@rgrjr.dyndns.org>  (tiny change)
 
 	* vc-svn.el (vc-svn-parse-status): ?D is for removed files (bug#3213).
diff --git a/lisp/faces.el b/lisp/faces.el
index 7e4c6d3a29c..778a363b170 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1924,7 +1924,14 @@ Value is the new parameter list."
   (let* ((name (or (cdr (assq 'name parameters))
 		   (cdr (assq 'name default-frame-alist))))
 	 (x-resource-name name)
-	 (res-geometry (if name (x-get-resource "geometry" "Geometry"))))
+	 (res-geometry (when name
+			 ;; FIXME: x-get-resource fails if the X
+			 ;; connection is not open, e.g. if we call
+			 ;; make-frame-on-display.  We should detect
+			 ;; this case here, and open the connection.
+			 ;; (Bug#3194).
+			 (ignore-errors
+			   (x-get-resource "geometry" "Geometry")))))
     (when res-geometry
       (let ((parsed (x-parse-geometry res-geometry)))
 	;; If the resource specifies a position, call the position