From: Richard M. Stallman <rms@gnu.org>
Date: Wed, 23 Nov 1994 04:46:14 +0000 (+0000)
Subject: (Calling menu-bar-enable-clipboard): Be less selective matching Suns.
X-Git-Tag: emacs-19.34~5799
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5b3dd5e8b830d9dd38a5d7a56e6e62dc67b7272e;p=emacs.git

(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 4bc8abfdf9b..dbb32175c44 100644
--- 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))