comparison 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
comparison
equal deleted inserted replaced
137:cae984061f40 138:6608ceec7cf8
3 ;; Copyright (C) 1994 Akira Kon, NEC Corporation. 3 ;; Copyright (C) 1994 Akira Kon, NEC Corporation.
4 ;; Copyright (C) 1996,1997 MORIOKA Tomohiko 4 ;; Copyright (C) 1996,1997 MORIOKA Tomohiko
5 5
6 ;; Author: Akira Kon <kon@d1.bs2.mt.nec.co.jp> 6 ;; Author: Akira Kon <kon@d1.bs2.mt.nec.co.jp>
7 ;; MORIOKA Tomohiko <morioka@jaist.ac.jp> 7 ;; MORIOKA Tomohiko <morioka@jaist.ac.jp>
8 ;; Version: $Revision: 1.5 $ 8 ;; Version: $Revision: 1.6 $
9 ;; Keywords: Canna, Japanese, input method, mule, multilingual 9 ;; Keywords: Canna, Japanese, input method, mule, multilingual
10 10
11 ;; This file is not a part of Emacs yet. 11 ;; This file is not a part of Emacs yet.
12 12
13 ;; This program is free software; you can redistribute it and/or 13 ;; This program is free software; you can redistribute it and/or
47 (defvar self-insert-after-hook nil) 47 (defvar self-insert-after-hook nil)
48 ;; (defalias 'self-insert-internal 'self-insert-command) 48 ;; (defalias 'self-insert-internal 'self-insert-command)
49 ;; end 49 ;; end
50 50
51 (defconst canna-rcs-version 51 (defconst canna-rcs-version
52 "$Id: canna.el,v 1.5 1997/04/10 05:55:27 steve Exp $") 52 "$Id: canna.el,v 1.6 1997/04/27 19:30:30 steve Exp $")
53 53
54 (defun canna-version () 54 (defun canna-version ()
55 "Display version of canna.el in mini-buffer." 55 "Display version of canna.el in mini-buffer."
56 (interactive) 56 (interactive)
57 (message (concat 57 (message (concat
172 "Add string of Canna status into mode-line." 172 "Add string of Canna status into mode-line."
173 (cond (running-xemacs 173 (cond (running-xemacs
174 (or (canna:memq-recursive 'mode-line-canna-mode 174 (or (canna:memq-recursive 'mode-line-canna-mode
175 default-modeline-format) 175 default-modeline-format)
176 (setq-default default-modeline-format 176 (setq-default default-modeline-format
177 (nconc '("" mode-line-canna-mode) 177 (append '("" mode-line-canna-mode)
178 default-modeline-format)) 178 default-modeline-format))
179 ) 179 )
180 (mapcar (function 180 (mapcar (function
181 (lambda (buffer) 181 (lambda (buffer)
182 (save-excursion 182 (save-excursion
183 (set-buffer buffer) 183 (set-buffer buffer)
184 (or (canna:memq-recursive 'mode-line-canna-mode 184 (or (canna:memq-recursive 'mode-line-canna-mode
185 modeline-format) 185 modeline-format)
186 (setq modeline-format 186 (setq modeline-format
187 (nconc '("" mode-line-canna-mode) 187 (append '("" mode-line-canna-mode)
188 modeline-format)) 188 modeline-format))
189 ) 189 )
190 ))) 190 )))
191 (buffer-list)) 191 (buffer-list))
192 ) 192 )
757 (if self-insert-after-hook 757 (if self-insert-after-hook
758 (if (<= 1 arg) 758 (if (<= 1 arg)
759 (funcall self-insert-after-hook 759 (funcall self-insert-after-hook
760 (- (point) arg) (point))) 760 (- (point) arg) (point)))
761 (if (= last-command-char ? ) (canna:do-auto-fill)))))) 761 (if (= last-command-char ? ) (canna:do-auto-fill))))))
762
763 ;; wire us into pending-delete
764 (put 'canna-self-insert-command 'pending-delete t)
762 765
763 (defun canna-toggle-japanese-mode () 766 (defun canna-toggle-japanese-mode ()
764 "Toggle canna japanese mode." 767 "Toggle canna japanese mode."
765 (interactive) 768 (interactive)
766 (let ((in-minibuffer (adjust-minibuffer-mode))) 769 (let ((in-minibuffer (adjust-minibuffer-mode)))