diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-10-09 23:28:24 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-10-09 23:28:24 -0400 |
| commit | a27cd28f9593138b430938854d7613f9029a94a9 (patch) | |
| tree | 78ec9459774e3ab26acd83b19d5ef555aab6fae3 /lisp/term | |
| parent | cd0351b20288ea6edd7a958317114f029a76c1c1 (diff) | |
* lisp/select.el (gui-selection-exists-p-alist): New method.
* lisp/menu-bar.el (menu-bar-edit-menu, clipboard-yank):
* lisp/simple.el (deactivate-mark): Use it.
* lisp/term/x-win.el (gui-selection-exists-p):
* lisp/term/w32-win.el (gui-selection-exists-p):
* lisp/term/pc-win.el (gui-selection-exists-p):
* lisp/term/ns-win.el (gui-selection-exists-p): Provide a backend instance.
Diffstat (limited to 'lisp/term')
| -rw-r--r-- | lisp/term/ns-win.el | 1 | ||||
| -rw-r--r-- | lisp/term/pc-win.el | 1 | ||||
| -rw-r--r-- | lisp/term/w32-win.el | 1 | ||||
| -rw-r--r-- | lisp/term/x-win.el | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el index 22e99d8796..1b7e075149 100644 --- a/lisp/term/ns-win.el +++ b/lisp/term/ns-win.el @@ -961,6 +961,7 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.") (gui-method-define gui-own-selection ns #'ns-own-selection-internal) (gui-method-define gui-disown-selection ns #'ns-disown-selection-internal) (gui-method-define gui-selection-owner-p ns #'ns-selection-owner-p) +(gui-method-define gui-selection-exists-p ns #'x-selection-exists-p) (gui-method-define gui-get-selection ns #'x-get-selection-internal) ;FIXME:name! (provide 'ns-win) diff --git a/lisp/term/pc-win.el b/lisp/term/pc-win.el index a7507377bd..7c2b8d6dff 100644 --- a/lisp/term/pc-win.el +++ b/lisp/term/pc-win.el @@ -228,6 +228,7 @@ Consult the selection. Treat empty strings as if they were unset." (w16-get-clipboard-data)))) ;; gui-selection-owner-p is used in simple.el. +(gui-method-define gui-selection-exists-p pc #'x-selection-exists-p) (gui-method-define gui-selection-owner-p pc #'w16-selection-owner-p) (defun w16-selection-owner-p (_selection) ;; FIXME: Other systems don't obey gui-select-enable-clipboard here. diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el index 7e32791c17..5266a45eba 100644 --- a/lisp/term/w32-win.el +++ b/lisp/term/w32-win.el @@ -420,6 +420,7 @@ Consult the selection. Treat empty strings as if they were unset." (lambda (selection) (and (memq selection '(nil PRIMARY SECONDARY)) (get 'x-selections (or selection 'PRIMARY))))) +(gui-method-define gui-selection-exists-p w32 #'x-selection-exists-p) ;; The "Windows" keys on newer keyboards bring up the Start menu ;; whether you want it or not - make Emacs ignore these keystrokes diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el index d6848628bf..4cbcf767c0 100644 --- a/lisp/term/x-win.el +++ b/lisp/term/x-win.el @@ -1473,6 +1473,7 @@ This returns an error if any Emacs frames are X frames." (gui-method-define gui-own-selection x #'x-own-selection-internal) (gui-method-define gui-disown-selection x #'x-disown-selection-internal) (gui-method-define gui-selection-owner-p x #'x-selection-owner-p) +(gui-method-define gui-selection-exists-p x #'x-selection-exists-p) (gui-method-define gui-get-selection x #'x-get-selection-internal) ;; Initiate drag and drop |