aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/international/fontset.el
diff options
context:
space:
mode:
authorKenichi Handa <[email protected]>2008-04-03 04:06:55 +0000
committerKenichi Handa <[email protected]>2008-04-03 04:06:55 +0000
commit1c9992b7da199ef2f57adf1d870db1b75c57c0d8 (patch)
tree62a84118d1fe8794ccb6da0c27d979a2586c1a0a /lisp/international/fontset.el
parentf2268dc05696f0882ce615a6422b03b84ac8c5c9 (diff)
(create-fontset-from-x-resource):
Handle the error of X resource more gracefully.
Diffstat (limited to 'lisp/international/fontset.el')
-rw-r--r--lisp/international/fontset.el4
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el
index b8c4a964b8..7fa9761ef0 100644
--- a/lisp/international/fontset.el
+++ b/lisp/international/fontset.el
@@ -944,7 +944,9 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.")
fontset-spec)
(while (setq fontset-spec (x-get-resource (format "fontset-%d" idx)
(format "Fontset-%d" idx)))
- (create-fontset-from-fontset-spec fontset-spec t 'noerror)
+ (condition-case nil
+ (create-fontset-from-fontset-spec fontset-spec t 'noerror)
+ (error (message "Fontset-%d: invalid specification in X resource" idx)))
(setq idx (1+ idx)))))
;;