summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/term/pc-win.el10
2 files changed, 14 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9d5394fed6c..0e9bd5bc718 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2010-11-26 Eli Zaretskii <eliz@gnu.org>
+
+ * term/pc-win.el (x-get-selection-internal): Emulation for MS-DOS.
+
2010-11-26 Glenn Morris <rgm@gnu.org>
* calendar/diary-lib.el (diary-outlook-format-1): New function, so that
diff --git a/lisp/term/pc-win.el b/lisp/term/pc-win.el
index 767c291c754..c13862a8da0 100644
--- a/lisp/term/pc-win.el
+++ b/lisp/term/pc-win.el
@@ -288,6 +288,16 @@ Disowning it means there is no such selection."
(if (x-selection-owner-p selection)
t))
+;; x-get-selection-internal is used in select.el
+(defun x-get-selection-internal (selection type &optional time_stamp)
+ "Return text selected from some X window.
+SELECTION is a symbol, typically `PRIMARY', `SECONDARY', or `CLIPBOARD'.
+\(Those are literal upper-case symbol names, since that's what X expects.)
+TYPE is the type of data desired, typically `STRING'.
+TIME_STAMP is the time to use in the XConvertSelection call for foreign
+selections. If omitted, defaults to the time for the last event."
+ (x-get-selection-value))
+
;; From src/fontset.c:
(fset 'query-fontset 'ignore)