Mercurial > emacs
diff lisp/faces.el @ 103168:14d59871ce25
* 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.
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Thu, 07 May 2009 00:03:42 +0000 |
parents | 8567720fb081 |
children | a0a7029a23d0 |
line wrap: on
line diff
--- 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