diff options
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/simple.el | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 52d3c015687..f0d7480371b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2013-09-19 Glenn Morris <rgm@gnu.org> + * simple.el (x-selection-owner-p, x-selection-exists-p): Declare. + * emacs-lisp/eieio.el (class-parent): Undo previous change. 2013-09-19 Michael Albinus <michael.albinus@gmx.de> diff --git a/lisp/simple.el b/lisp/simple.el index bf531de8ae4..d259851dc85 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -4159,6 +4159,12 @@ a mistake; see the documentation of `set-mark'." (marker-position (mark-marker)) (signal 'mark-inactive nil))) +;; Behind display-selections-p. +(declare-function x-selection-owner-p "xselect.c" + (&optional selection terminal)) +(declare-function x-selection-exists-p "xselect.c" + (&optional selection terminal)) + (defun deactivate-mark (&optional force) "Deactivate the mark. If Transient Mark mode is disabled, this function normally does |