[Mew-dist 1300] Re: mew-1.86 & im-46 beta release

[SAKAI Kiyotaka]

>> In article <19970721225150A.kazu at example.com>, Kazu Yamamoto (山本和彦) <Kazu at example.com> writes:

> (2) mew-draft-keyswitch を変更しないといけないと思うのですが、よく理解で
> きなかったので Mew 1.86 に対するパッチを作成してもらえないでしょうか？ 
>> 酒井さん

このためのパッチを作成しました。
-- 
酒井 清隆 (E-mail: ksakai at example.com)


-------------- next part --------------
===================================================================
RCS file: RCS/mew-draft.el,v
retrieving revision 1.1
diff -u -r1.1 mew-draft.el
--- mew-draft.el	1997/07/23 03:03:19	1.1
+++ mew-draft.el	1997/07/23 04:33:19
@@ -902,21 +902,22 @@
 	 (i 0) len func)
     (if (numberp command)
 	(setq len command
-	      command (lookup-key (current-global-map) 
+	      command (lookup-key (current-global-map)
 				  (mew-subsequence key 0 len))
 	      key (mew-subsequence key len)))
     (setq len (length key))
     (if (or (eq command 'universal-argument) (eq command 'digit-argument))
 	(catch 'keyswitch
-	  (while (and (eq command 'universal-argument)
-		      (<= ?0 (aref key i)) (>= ?9 (aref key i)))
+	  (while (and (or (eq command 'universal-argument)
+			  (eq command 'digit-argument))
+		      (let ((tmp (aref key i)))
+			(if mew-xemacs-p (setq tmp (event-to-character tmp)))
+			(and (<= ?0 tmp) (>= ?9 tmp))))
 	    (setq i (1+ i)))
 	  (while (< i len)
 	    (if (eq 'mew-draft-keyswitch
 		    (key-binding (char-to-string (aref key i))))
-		(throw 'keyswitch (if (vectorp key)
-				      (setq key (mew-subvector key i))
-				    (setq key (substring key i)))))
+		(throw 'keyswitch (setq key (mew-subsequence key i))))
 	    (setq i (1+ i))
 	    )
 	  ))
@@ -931,8 +932,7 @@
      )
     (if (not (integerp func))
 	()
-      (if (vectorp key) (setq key (mew-subvector key 0 func))
-	(setq key (substring key 0 func)))
+      (setq key (mew-subsequence key 0 func))
       (setq func (lookup-key (current-global-map) key))
       (cond
        ((and (markerp mew-draft-buffer-attach) (mew-draft-in-attach-p))
@@ -949,8 +949,7 @@
       (setq func (lookup-key (current-global-map) key))
       (if (not (integerp func))
 	  ()
-	(if (vectorp key) (setq key (mew-subvector key 0 func))
-	  (setq key (substring key 0 func)))
+	(setq key (mew-subsequence key 0 func))
 	(setq func (lookup-key (current-global-map) key))
 	)
       )