[Emacs-diffs] emacs/lisp ChangeLog faces.el

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/05/07 00:03:47

Modified files:
        lisp           : ChangeLog faces.el 

Log message:
        * 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.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15630&r2=1.15631
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/faces.el?cvsroot=emacs&r1=1.440&r2=1.441

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15630
retrieving revision 1.15631
diff -u -b -r1.15630 -r1.15631
--- ChangeLog   5 May 2009 04:17:27 -0000       1.15630
+++ ChangeLog   7 May 2009 00:03:42 -0000       1.15631
@@ -1,3 +1,9 @@
+2009-05-07  Chong Yidong  <address@hidden>
+
+       * 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  <address@hidden>  (tiny change)
 
        * vc-svn.el (vc-svn-parse-status): ?D is for removed files (bug#3213).

Index: faces.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/faces.el,v
retrieving revision 1.440
retrieving revision 1.441
diff -u -b -r1.440 -r1.441
--- faces.el    13 Apr 2009 14:06:51 -0000      1.440
+++ faces.el    7 May 2009 00:03:46 -0000       1.441
@@ -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