diff lisp/mule/canna.el @ 138:6608ceec7cf8 r20-2b3

Import from CVS: tag r20-2b3
author cvs
date Mon, 13 Aug 2007 09:31:46 +0200
parents cca96a509cfe
children 0132846995bd
line wrap: on
line diff
--- a/lisp/mule/canna.el	Mon Aug 13 09:31:13 2007 +0200
+++ b/lisp/mule/canna.el	Mon Aug 13 09:31:46 2007 +0200
@@ -5,7 +5,7 @@
 
 ;; Author: Akira Kon <kon@d1.bs2.mt.nec.co.jp>
 ;;         MORIOKA Tomohiko <morioka@jaist.ac.jp>
-;; Version: $Revision: 1.5 $
+;; Version: $Revision: 1.6 $
 ;; Keywords: Canna, Japanese, input method, mule, multilingual
 
 ;; This file is not a part of Emacs yet.
@@ -49,7 +49,7 @@
 ;; end
 
 (defconst canna-rcs-version
-  "$Id: canna.el,v 1.5 1997/04/10 05:55:27 steve Exp $")
+  "$Id: canna.el,v 1.6 1997/04/27 19:30:30 steve Exp $")
 
 (defun canna-version ()
   "Display version of canna.el in mini-buffer."
@@ -174,7 +174,7 @@
 	 (or (canna:memq-recursive 'mode-line-canna-mode
 				   default-modeline-format)
 	     (setq-default default-modeline-format
-			   (nconc '("" mode-line-canna-mode)
+			   (append '("" mode-line-canna-mode)
 				  default-modeline-format))
 	     )
 	 (mapcar (function
@@ -184,7 +184,7 @@
 		      (or (canna:memq-recursive 'mode-line-canna-mode
 						modeline-format)
 			  (setq modeline-format
-				(nconc '("" mode-line-canna-mode)
+				(append '("" mode-line-canna-mode)
 				       modeline-format))
 			  )
 		      )))
@@ -760,6 +760,9 @@
 		       (- (point) arg) (point)))
 	(if (= last-command-char ? ) (canna:do-auto-fill))))))
 
+;; wire us into pending-delete
+(put 'canna-self-insert-command 'pending-delete t)
+
 (defun canna-toggle-japanese-mode ()
   "Toggle canna japanese mode."
   (interactive)