(report-emacs-bug): Don't hard code the "X" name.

2 files changed, 8 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 110b94186cc..9c572fa2063 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2007-03-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * mail/emacsbug.el (report-emacs-bug): Don't hard code the "X" name.
+
 2007-03-10  Chong Yidong  <cyd@stupidchicken.com>
 
         * faces.el (face-set-after-frame-default): Recalculate face
diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el
index cbe14052e19..c60d93b26b1 100644
--- a/lisp/mail/emacsbug.el
+++ b/lisp/mail/emacsbug.el
@@ -139,7 +139,9 @@ usually do not have translators to read other languages for them.\n\n")
     (insert "\n\nIn " (emacs-version) "\n")
     (if (fboundp 'x-server-vendor)
         (condition-case nil
-            (insert "X server distributor `" (x-server-vendor) "', version "
+            ;; This is used not only for X11 but also W32 and others.
+            (insert "Windowing system distributor `" (x-server-vendor)
+                    "', version "
                     (mapconcat 'number-to-string (x-server-version) ".") "\n")
           (error t)))
     (if (and system-configuration-options
@@ -281,5 +283,5 @@ and send the mail again using \\[mail-send-and-exit].")))
 
 (provide 'emacsbug)
 
-;;; arch-tag: 248b6523-c3b5-4fec-9a3f-0411fafa7d49
+;; arch-tag: 248b6523-c3b5-4fec-9a3f-0411fafa7d49
 ;;; emacsbug.el ends here