Mercurial > emacs
changeset 58462:8d3f889b4462
* mail/emacsbug.el (report-emacs-bug): Catch error that x-server-vendor
and x-server-version may throw.
| author | Jan Djärv <jan.h.d@swipnet.se> |
|---|---|
| date | Tue, 23 Nov 2004 19:22:43 +0000 |
| parents | 5049881e14d7 |
| children | 86fddd350b35 |
| files | lisp/ChangeLog lisp/mail/emacsbug.el |
| diffstat | 2 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Tue Nov 23 16:41:27 2004 +0000 +++ b/lisp/ChangeLog Tue Nov 23 19:22:43 2004 +0000 @@ -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
--- a/lisp/mail/emacsbug.el Tue Nov 23 16:41:27 2004 +0000 +++ b/lisp/mail/emacsbug.el Tue Nov 23 19:22:43 2004 +0000 @@ -129,8 +129,10 @@ (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 "