# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1173576590 0
# Node ID a3474cbaf397113f091211ea722eabe2a1759b3f
# Parent  2a29ff806389938b398e9c3af2b417b412733886
(report-emacs-bug): Don't hard code the "X" name.

diff -r 2a29ff806389 -r a3474cbaf397 lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Mar 11 01:03:17 2007 +0000
+++ b/lisp/ChangeLog	Sun Mar 11 01:29:50 2007 +0000
@@ -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 -r 2a29ff806389 -r a3474cbaf397 lisp/mail/emacsbug.el
--- a/lisp/mail/emacsbug.el	Sun Mar 11 01:03:17 2007 +0000
+++ b/lisp/mail/emacsbug.el	Sun Mar 11 01:29:50 2007 +0000
@@ -139,7 +139,9 @@
     (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 @@
 
 (provide 'emacsbug)
 
-;;; arch-tag: 248b6523-c3b5-4fec-9a3f-0411fafa7d49
+;; arch-tag: 248b6523-c3b5-4fec-9a3f-0411fafa7d49
 ;;; emacsbug.el ends here