diff options
| author | Jan Djärv <jan.h.d@swipnet.se> | 2004-11-23 19:22:43 +0000 |
|---|---|---|
| committer | Jan Djärv <jan.h.d@swipnet.se> | 2004-11-23 19:22:43 +0000 |
| commit | 6f8a2742299b9c3518f87ad2baebfa19867997cc (patch) | |
| tree | 0cee354543c24747b1acfd4ebb1904bf81a0fd05 /lisp | |
| parent | 5f11b513c88a68b27da0eeaac216bce980ec7a67 (diff) | |
| download | emacs-6f8a2742299b9c3518f87ad2baebfa19867997cc.tar.gz emacs-6f8a2742299b9c3518f87ad2baebfa19867997cc.tar.bz2 emacs-6f8a2742299b9c3518f87ad2baebfa19867997cc.zip | |
* mail/emacsbug.el (report-emacs-bug): Catch error that x-server-vendor
and x-server-version may throw.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/mail/emacsbug.el | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e4708bedc53..532c066e289 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2004-11-23 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> + + * mail/emacsbug.el (report-emacs-bug): Catch error that x-server-vendor + and x-server-version may throw. + 2004-11-23 Kim F. Storm <storm@cua.dk> * subr.el (substitute-key-definition-key): Optimize. Don't diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el index c5579b3c0db..5daa9a2d4aa 100644 --- a/lisp/mail/emacsbug.el +++ b/lisp/mail/emacsbug.el @@ -129,8 +129,10 @@ usually do not have translators to read other languages for them.\n\n") (insert "In " (emacs-version) "\n") (if (fboundp 'x-server-vendor) - (insert "Distributor `" (x-server-vendor) "', version " - (mapconcat 'number-to-string (x-server-version) ".") "\n")) + (condition-case nil + (insert "Distributor `" (x-server-vendor) "', version " + (mapconcat 'number-to-string (x-server-version) ".") "\n") + (error t))) (if (and system-configuration-options (not (equal system-configuration-options ""))) (insert "configured using `configure " |