Mercurial > hg > xemacs-beta

diff lisp/select.el @ 771:943eaba38521

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2002-03-13 08:51:24 by ben] The big ben-mule-21-5 check-in! Various files were added and deleted. See CHANGES-ben-mule. There are still some test suite failures. No crashes, though. Many of the failures have to do with problems in the test suite itself rather than in the actual code. I'll be addressing these in the next day or so -- none of the test suite failures are at all critical. Meanwhile I'll be trying to address the biggest issues -- i.e. build or run failures, which will almost certainly happen on various platforms. All comments should be sent to ben@xemacs.org -- use a Cc: if necessary when sending to mailing lists. There will be pre- and post- tags, something like pre-ben-mule-21-5-merge-in, and post-ben-mule-21-5-merge-in.
author ben
date Wed, 13 Mar 2002 08:54:06 +0000
parents 54fa1a5c2d12
children 42a86787d173
line wrap: on
line diff
--- a/lisp/select.el	Fri Mar 08 13:33:14 2002 +0000
+++ b/lisp/select.el	Wed Mar 13 08:54:06 2002 +0000
@@ -666,14 +666,30 @@
 
 ;;; CF_xxx conversions
 (defun select-convert-from-cf-text (selection type value)
-  (replace-in-string (if (string-match "\0" value)
-			 (substring value 0 (match-beginning 0))
-		       value)
-		     "\\(\r\n\\|\n\r\\)" "\n" t))
+  (let ((value (decode-coding-string value 'mswindows-multibyte)))
+    (replace-in-string (if (string-match "\0" value)
+			   (substring value 0 (match-beginning 0))
+			 value)
+		       "\\(\r\n\\|\n\r\\)" "\n" t)))
+
+(defun select-convert-from-cf-unicodetext (selection type value)
+  (let ((value (decode-coding-string value 'mswindows-unicode)))
+    (replace-in-string (if (string-match "\0" value)
+			   (substring value 0 (match-beginning 0))
+			 value)
+		       "\\(\r\n\\|\n\r\\)" "\n" t)))
 
 (defun select-convert-to-cf-text (selection type value)
   (let ((text (select-convert-to-text selection type value)))
-    (concat (replace-in-string text "\n" "\r\n" t) "\0")))
+    (encode-coding-string
+     (concat (replace-in-string text "\n" "\r\n" t) "\0")
+     'mswindows-multibyte)))
+
+(defun select-convert-to-cf-unicodetext (selection type value)
+  (let ((text (select-convert-to-text selection type value)))
+    (encode-coding-string
+     (concat (replace-in-string text "\n" "\r\n" t) "\0")
+     'mswindows-unicode)))
 
 ;;; Appenders
 (defun select-append-to-text (selection type value1 value2)
@@ -696,6 +712,15 @@
 	(select-convert-to-cf-text selection type (concat text1 text2))
       nil)))
 
+(defun select-append-to-cf-unicodetext (selection type value1 value2)
+  (let ((text1 (select-convert-from-cf-unicodetext selection
+						    'CF_UNICODETEXT value1))
+	(text2 (select-convert-from-cf-unicodetext selection
+						    'CF_UNICODETEXT value2)))
+    (if (and text1 text2)
+	(select-convert-to-cf-unicodetext selection type (concat text1 text2))
+      nil)))
+
 (defun select-append-default (selection type value1 value2)
 ;; This appender gets used if the type is "nil" - i.e. default.
 ;; It should probably have more cases implemented than it does - e.g.
@@ -761,6 +786,7 @@
 	(ATOM . select-convert-to-atom)
 	(INTEGER . select-convert-to-integer)
 	(CF_TEXT . select-convert-to-cf-text)
+	(CF_UNICODETEXT . select-convert-to-cf-unicodetext)
 	))
 
 ;; Types listed here can be selections foreign to XEmacs
@@ -780,6 +806,7 @@
 	(LENGTH . select-convert-from-length)
 	(FILE_NAME . select-convert-from-filename)
 	(CF_TEXT . select-convert-from-cf-text)
+	(CF_UNICODETEXT . select-convert-from-cf-unicodetext)
 	))
 
 ;; Types listed here have special coercion functions that can munge
@@ -796,7 +823,9 @@
       '((TEXT . select-coerce-to-text)
 	(STRING . select-coerce-to-text)
 	(COMPOUND_TEXT . select-coerce-to-text)
-	(CF_TEXT . select-coerce-to-text)))
+	(CF_TEXT . select-coerce-to-text)
+	(CF_UNICODETEXT . select-coerce-to-text)
+	))
 
 ;; Types listed here can be appended by own-selection
 (setq selection-appender-alist
@@ -805,6 +834,7 @@
 	(STRING . select-append-to-string)
 	(COMPOUND_TEXT . select-append-to-compound-text)
 	(CF_TEXT . select-append-to-cf-text)
+	(CF_UNICODETEXT . select-append-to-cf-unicodetext)
 	))
 
 ;; Types listed here have buffer-kill handlers
@@ -813,9 +843,11 @@
 	(TEXT . select-buffer-killed-text)
 	(STRING . select-buffer-killed-text)
 	(COMPOUND_TEXT . select-buffer-killed-text)
-	(CF_TEXT . select-buffer-killed-text)))
+	(CF_TEXT . select-buffer-killed-text)
+	(CF_UNICODETEXT . select-buffer-killed-text)
+	))
 
 ;; Lists of types that are coercible (can be converted to other types)
-(setq selection-coercible-types '(TEXT STRING COMPOUND_TEXT))
+(setq selection-coercible-types '(TEXT STRING COMPOUND_TEXT CF_TEXT CF_UNICODETEXT))
 
 ;;; select.el ends here