Merge changes made in Gnus trunk.

[gnu-emacs] / lisp / select.el

diff --git a/lisp/select.el b/lisp/select.el
index 23541963438e8f9df0aac1ba40af8ac7fa3b653b..7ca5c3a432dba884ed01cedcbf099ac2614c039f 100644 (file)
--- a/lisp/select.el
+++ b/lisp/select.el
@@ -1,7 +1,6 @@
 ;;; select.el --- lisp portion of standard selection support
 
-;; Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-;;   2008, 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 1993-1994, 2001-2011  Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
@@ -75,8 +74,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,