diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2017-01-01 01:02:45 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-01-01 01:02:45 -0800 |
| commit | 4f7a90bf6ce831063d721324e712f8c38e85c678 (patch) | |
| tree | 73e980746ddc55c4285d145769a94b2845cbfcdf /lisp/menu-bar.el | |
| parent | 620e5a3cd4464aaffaa3568d6f6b89764de5cfbd (diff) | |
| parent | 9adb101353e1f3d41a8f822fa4164e9b41e82ce5 (diff) | |
| download | emacs-4f7a90bf6ce831063d721324e712f8c38e85c678.tar.gz | |
Merge from origin/emacs-25
9adb101 Document 'describe-fontset'
229315c ; Add missing symbol quoting.
3d94931 Repair desktop restoration on text terminals
43022f9 Ignore forward-sexp-function in js-mode indentation code
b19fb49 Improve documentation of 'define-coding-system'
467768f Fix Bug#25162
6db78ae Fix a typo in define-abbrev-table
5f7d906 Bump makeinfo requirement from 4.7 to 4.13
442e2f6 Fixes related to select-enable-clipboard
e4ac450 Define struct predicate before acccesors
08decbd Doc fix for vc-git
5531e75 Further improve make-dist checking
953bf67 Improve previous make-dist change
129645a Make make-dist --snapshot do some sanity checks
# Conflicts:
# lisp/menu-bar.el
Diffstat (limited to 'lisp/menu-bar.el')
| -rw-r--r-- | lisp/menu-bar.el | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el index d21fa2cd61c..af031bd99c0 100644 --- a/lisp/menu-bar.el +++ b/lisp/menu-bar.el @@ -530,14 +530,10 @@ (gui-backend-selection-exists-p 'CLIPBOARD)) (not buffer-read-only))))) -(defvar gui-select-enable-clipboard) - (defun clipboard-yank () "Insert the clipboard contents, or the last stretch of killed text." (interactive "*") - (let ((gui-select-enable-clipboard t) - (interprogram-paste-function (or interprogram-paste-function - #'gui-selection-value))) + (let ((select-enable-clipboard t)) (yank))) (defun clipboard-kill-ring-save (beg end &optional region) @@ -545,9 +541,7 @@ If the optional argument REGION is non-nil, the function ignores BEG and END, and saves the current region instead." (interactive "r\np") - (let ((gui-select-enable-clipboard t) - (interprogram-cut-function (or interprogram-cut-function - #'gui-select-text))) + (let ((select-enable-clipboard t)) (kill-ring-save beg end region))) (defun clipboard-kill-region (beg end &optional region) @@ -555,9 +549,7 @@ BEG and END, and saves the current region instead." If the optional argument REGION is non-nil, the function ignores BEG and END, and kills the current region instead." (interactive "r\np") - (let ((gui-select-enable-clipboard t) - (interprogram-cut-function (or interprogram-cut-function - #'gui-select-text))) + (let ((select-enable-clipboard t)) (kill-region beg end region))) (defun menu-bar-enable-clipboard () |