diff options
| author | Chong Yidong <[email protected]> | 2009-05-07 00:03:42 +0000 |
|---|---|---|
| committer | Chong Yidong <[email protected]> | 2009-05-07 00:03:42 +0000 |
| commit | 8c61dd01c0960de0d70323257832cf0aaded356b (patch) | |
| tree | 7d59d1d4de430e3f1a93b7b66eaf982cb90bb222 /lisp | |
| parent | b8914ad2ce48bd8bcb329c2d7aaf9af92ddac1d5 (diff) | |
* 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.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/faces.el | 9 |
2 files changed, 14 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b4e87672e3..155e704960 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2009-05-07 Chong Yidong <[email protected]> + + * 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 <[email protected]> (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 7e4c6d3a29..778a363b17 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 |