Mercurial > emacs

changeset 88785:3387266b74c1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(utf-8-ccl-encode): Deleted. (ucs-input-method): Modified.
author Dave Love <fx@gnu.org>
date Mon, 24 Jun 2002 19:26:00 +0000
parents 7bb2a408955b
children bf88f61fd824
files leim/quail/uni-input.el
diffstat 1 files changed, 9 insertions(+), 43 deletions(-) [+]
line wrap: on
line diff
--- a/leim/quail/uni-input.el	Mon Jun 24 19:07:19 2002 +0000
+++ b/leim/quail/uni-input.el	Mon Jun 24 19:26:00 2002 +0000
@@ -1,6 +1,6 @@
 ;;; uni-input.el --- Hex Unicode input method
 
-;; Copyright (C) 2001  Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002  Free Software Foundation, Inc.
 
 ;; Author: Dave Love <fx@gnu.org>
 ;; Keywords: i18n
@@ -30,42 +30,13 @@
 ;; This is not really a Quail method, but uses some Quail functions.
 ;; There is probably A Better Way.
 
-;; Compare `ucs-insert', which explicitly inserts a unicoded character
-;; rather than supplying an input method.
+;; You can get a similar effect by using C-q with
+;; `read-quoted-char-radix' set to 16.
 
 ;;; Code:
 
 (require 'quail)
 
-;; Maybe stolen from Mule-UCS -- I don't remember.
-(define-ccl-program utf-8-ccl-encode
-  `(4 (if (r0 < ?\x80)
-	((write r0))
-      (if (r0 < #x800)
-	  ((write ((r0 >> 6) | ?\xC0))
-	   (write ((r0 & ?\x3F) | ?\x80)))
-	(if (r0 < #x10000)
-	    ((write ((r0 >> 12) | ?\xE0))
-	     (write (((r0 >> 6) & ?\x3F) | ?\x80))
-	     (write ((r0 & ?\x3F) | ?\x80)))
-	  (if (r0 < #x200000)
-	      ((write ((r0 >> 18) | ?\xF0))
-	       (write (((r0 >> 12) & ?\3F) | ?\x80))
-	       (write (((r0 >> 6) & ?\x3F) | ?\x80))
-	       (write ((r0 & ?\x3F) | ?\x80)))
-	    (if (r0 < #x4000000)
-		((write ((r0 >> 24) | ?\xF8))
-		 (write (((r0 >> 18) & ?\x3F) | ?\x80))
-		 (write (((r0 >> 12) & ?\x3F) | ?\x80))
-		 (write (((r0 >> 6) & ?\x3F) | ?\x80))
-		 (write ((r0 & ?\x3f) | ?\x80)))
-	      ((write ((r0 >> 30) | ?\xFC))
-	       (write (((r0 >> 24) & ?\x3F) | ?\x80))
-	       (write (((r0 >> 18) & ?\x3F) | ?\x80))
-	       (write (((r0 >> 12) & ?\x3F) | ?\x80))
-	       (write (((r0 >> 6) & ?\x3F) | ?\x80))
-	       (write ((r0 & ?\x3f) | ?\x80))))))))))
-
 (defun ucs-input-method (key)
   (if (or buffer-read-only
 	  (and (/= key ?U) (/= key ?u)))
@@ -91,7 +62,7 @@
 			   (= 1 (length seq))
 			   (setq key (aref seq 0))
 			   (memq key '(?0 ?1 ?2 ?3 ?4 ?5 ?6 ?7 ?8 ?9 ?a
-				       ?b ?c ?d ?e ?f ?A ?B ?C ?D ?E ?F)))
+					  ?b ?c ?d ?e ?f ?A ?B ?C ?D ?E ?F)))
 		      (progn
 			(push key events)
 			(let ((last-command-char key)
@@ -105,16 +76,11 @@
 		    (throw 'non-digit (append (reverse events)
 					      (listify-key-sequence seq))))))
 	      (quail-delete-region)
-	      (let* ((n (string-to-number (apply 'string
-						 (cdr (nreverse events)))
-					  16))
-		     (c (decode-char 'ucs n))
-		    (status (make-vector 9 nil)))
-		(if c
-		    (list c)
-		  (aset status 0 n)
-		  (string-to-list (ccl-execute-on-string
-				   'utf-8-ccl-encode status ""))))))
+	      (let ((n (string-to-number (apply 'string
+					    (cdr (nreverse events)))
+				     16)))
+		(if (characterp n)
+		    (list n)))))
 	(quail-delete-overlays)
 	(set-buffer-modified-p modified-p)
 	(run-hooks 'input-method-after-insert-chunk-hook)))))