1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-13 09:32:47 +00:00

* 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.
This commit is contained in:
Chong Yidong 2009-05-07 00:03:42 +00:00
parent b8914ad2ce
commit 8c61dd01c0
2 changed files with 14 additions and 1 deletions

View File

@ -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).

View File

@ -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