summaryrefslogtreecommitdiff
path: root/lisp/select.el
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2010-10-31 10:40:01 -0400
committerChong Yidong <cyd@stupidchicken.com>2010-10-31 10:40:01 -0400
commit2699a55464f7b43171c7b0e64d095640904e9e21 (patch)
treed99ebc74b0a108dac964f0fbcd9f9d3592ac5c6f /lisp/select.el
parente6ef5dd9ce13d346c7bbdcd6794b29045b4e0e63 (diff)
parent46eadc7aeedf0fe3944291e2631d8604b38fe25f (diff)
downloademacs-2699a55464f7b43171c7b0e64d095640904e9e21.tar.gz
Merge changes from emacs-23 branch
Diffstat (limited to 'lisp/select.el')
-rw-r--r--lisp/select.el5
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/select.el b/lisp/select.el
index 23541963438..0f43ce05822 100644
--- a/lisp/select.el
+++ b/lisp/select.el
@@ -75,8 +75,9 @@ After the communication, this variable is set to nil.")
(declare-function x-get-selection-internal "xselect.c"
(selection-symbol target-type &optional time-stamp))
-;; This is for temporary compatibility with pre-release Emacs 19.
-(defalias 'x-selection 'x-get-selection)
+;; Only declared obsolete in 23.3.
+(define-obsolete-function-alias 'x-selection 'x-get-selection "at least 19.34")
+
(defun x-get-selection (&optional type data-type)
"Return the value of an X Windows selection.
The argument TYPE (default `PRIMARY') says which selection,