Mercurial > emacs
changeset 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 | 213c2ab692d9 |
| children | 6f832a7c8071 |
| files | lisp/ChangeLog lisp/faces.el |
| diffstat | 2 files changed, 14 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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).
--- 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