(Calling menu-bar-enable-clipboard): Be less selective matching Suns.

diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index 4bc8abfdf9b0751e57c360652d73691235eed15e..dbb32175c447e78f009887aeb5c60d5a1b71ecaa 100644 (file)
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -685,7 +685,8 @@ This is in addition to the primary selection.")
                            x-cut-buffer-max))
 
 ;; Sun expects the menu bar cut and paste commands to use the clipboard.
-(if (string-match "X11/NeWS - Sun Microsystems Inc\\."
+;; This has ,? to match both on Sunos and on Solaris.
+(if (string-match " Sun Microsystems,? Inc\\."
                  (x-server-vendor))
     (menu-bar-enable-clipboard))