# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1241654622 0
# Node ID 14d59871ce257546512d19c1776dad3338a7e86e
# Parent  213c2ab692d9ab1bdf9a0877cd1dfc802c4716cd
* 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 -r 213c2ab692d9 -r 14d59871ce25 lisp/ChangeLog
--- a/lisp/ChangeLog	Wed May 06 08:38:22 2009 +0000
+++ b/lisp/ChangeLog	Thu May 07 00:03:42 2009 +0000
@@ -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 -r 213c2ab692d9 -r 14d59871ce25 lisp/faces.el
--- a/lisp/faces.el	Wed May 06 08:38:22 2009 +0000
+++ b/lisp/faces.el	Thu May 07 00:03:42 2009 +0000
@@ -1924,7 +1924,14 @@
   (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