diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/term/x-win.el | 23 |
2 files changed, 22 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 44862546392..e225d87ddd8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2004-01-21 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> + + * term/x-win.el: Call menu-bar-enable-clipboard and make Paste + use clipboard first. + 2004-01-20 Stefan Monnier <monnier@iro.umontreal.ca> * outline.el (outline-insert-heading): Tighten up match. diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el index d6260cb0bf7..9e37943032b 100644 --- a/lisp/term/x-win.el +++ b/lisp/term/x-win.el @@ -2385,12 +2385,6 @@ order until succeed.") ;; generated from FONT. (create-fontset-from-ascii-font font resolved-name "startup")))) -;; Sun expects the menu bar cut and paste commands to use the clipboard. -;; This has ,? to match both on Sunos and on Solaris. -(if (string-match "Sun Microsystems,? Inc\\." - (x-server-vendor)) - (menu-bar-enable-clipboard)) - ;; Apply a geometry resource to the initial frame. Put it at the end ;; of the alist, so that anything specified on the command line takes ;; precedence. @@ -2456,5 +2450,22 @@ order until succeed.") ;; Turn on support for mouse wheels. (mouse-wheel-mode 1) +;; Enable CLIPBOARD copy/paste through menu bar commands. +(menu-bar-enable-clipboard) + +;; Override Paste so it looks at CLIPBOARD first. +(defun x-clipboard-yank () + "Insert the clipboard contents, or the last stretch of killed text." + (interactive) + (let ((clipboard-text (x-get-selection 'CLIPBOARD)) + (x-select-enable-clipboard t)) + (if (and clipboard-text (> (length clipboard-text) 0)) + (kill-new clipboard-text)) + (yank))) + +(define-key menu-bar-edit-menu [paste] + (cons "Paste" (cons "Paste text from clipboard or kill ring" + 'x-clipboard-yank))) + ;;; arch-tag: f1501302-db8b-4d95-88e3-116697d89f78 ;;; x-win.el ends here |