diff options
| author | Glenn Morris | 2010-10-27 20:52:14 -0700 |
|---|---|---|
| committer | Glenn Morris | 2010-10-27 20:52:14 -0700 |
| commit | 82f7efc32013723c80f6c4159427aa21575697cc (patch) | |
| tree | dd01e98106c52d4cb6485ec34d4c60dd0054c5a5 | |
| parent | ca39416c788ea47781f3ebb564d52df6fbf3af95 (diff) | |
| download | emacs-82f7efc32013723c80f6c4159427aa21575697cc.tar.gz emacs-82f7efc32013723c80f6c4159427aa21575697cc.zip | |
* lisp/select.el (x-selection): Mark it as an obsolete alias.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/select.el | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f41bd45cfd4..bb530c0192a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2010-10-28 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * select.el (x-selection): Mark it as an obsolete alias. | ||
| 4 | |||
| 1 | 2010-10-27 Aaron S. Hawley <aaron.s.hawley@gmail.com> | 5 | 2010-10-27 Aaron S. Hawley <aaron.s.hawley@gmail.com> |
| 2 | 6 | ||
| 3 | * add-log.el (find-change-log): Use derived-mode-p rather than | 7 | * add-log.el (find-change-log): Use derived-mode-p rather than |
diff --git a/lisp/select.el b/lisp/select.el index 842c250df60..bada2e70e75 100644 --- a/lisp/select.el +++ b/lisp/select.el | |||
| @@ -67,8 +67,9 @@ variable is set to nil.") | |||
| 67 | (declare-function x-get-selection-internal "xselect.c" | 67 | (declare-function x-get-selection-internal "xselect.c" |
| 68 | (selection-symbol target-type &optional time-stamp)) | 68 | (selection-symbol target-type &optional time-stamp)) |
| 69 | 69 | ||
| 70 | ;; This is for temporary compatibility with pre-release Emacs 19. | 70 | ;; Only declared obsolete in 23.3. |
| 71 | (defalias 'x-selection 'x-get-selection) | 71 | (define-obsolete-function-alias 'x-selection 'x-get-selection "at least 19.34") |
| 72 | |||
| 72 | (defun x-get-selection (&optional type data-type) | 73 | (defun x-get-selection (&optional type data-type) |
| 73 | "Return the value of an X Windows selection. | 74 | "Return the value of an X Windows selection. |
| 74 | The argument TYPE (default `PRIMARY') says which selection, | 75 | The argument TYPE (default `PRIMARY') says which selection, |
| @@ -410,5 +411,4 @@ This function returns the string \"emacs\"." | |||
| 410 | 411 | ||
| 411 | (provide 'select) | 412 | (provide 'select) |
| 412 | 413 | ||
| 413 | ;; arch-tag: bb634f97-8a3b-4b0a-b940-f6e09982328c | ||
| 414 | ;;; select.el ends here | 414 | ;;; select.el ends here |