emacs: lisp/international/kkc.el comparison

comparison lisp/international/kkc.el @ 22888:5bfe86125303

(kkc-lookup-cache): Initialize it to nil. (kkc-lookup-cache-tag): New constant. (kkc-lookup-key): If kkc-lookup-cache is nil, initialize it. Use kkc-init-file-name. (kkc-region): Fix previous change. Call kkc-error on error. (kkc-shorter-conversion, kkc-longer-phrase): New functions. (kkc-keymap): Bind them to "I" and "O" respectively. (kkc-error): New error symbol and new function. (kkc-longer, kkc-shorter): Call kkc-error on error. (kkc-show-conversion-list-or-next-group): Likewise. (kkc-show-conversion-list-or-prev-group): Likewise.

author	Kenichi Handa <handa@m17n.org>
date	Sun, 02 Aug 1998 01:06:57 +0000
parents	8f9d4edebbdd
children	95d147bbdce0

comparison

equal deleted inserted replaced

-:e24b79da83d6
+:5bfe86125303
 (defvar kkc-init-file-flag nil)
 ;; Cash data for `kkc-lookup-key'.  This may be initialized by loading
 ;; a file specified by `kkc-init-file-name'.  If any elements are
 ;; modified, the data is written out to the file when exiting Emacs.
-(defvar kkc-lookup-cache '(kkc-lookup-cache))
+(defvar kkc-lookup-cache nil)
+;; Tag symbol of `kkc-lookup-cache'.
+(defconst kkc-lookup-cache-tag 'kkc-lookup-cache-2)
 (defun kkc-save-init-file ()
 "Save initial setup code for KKC to a file specified by `kkc-init-file-name'"
 (if (and kkc-init-file-flag
 	   (not (eq kkc-init-file-flag t)))
 (define-key map "\C-@" 'kkc-first-char-only)
 (define-key map "\C-n" 'kkc-next)
 (define-key map "\C-p" 'kkc-prev)
 (define-key map "\C-i" 'kkc-shorter)
 (define-key map "\C-o" 'kkc-longer)
+(define-key map "I" 'kkc-shorter-conversion)
+(define-key map "O" 'kkc-longer-phrase)
 (define-key map "\C-c" 'kkc-cancel)
 (define-key map "\C-?" 'kkc-cancel)
 (define-key map "\C-f" 'kkc-next-phrase)
 (define-key map "K" 'kkc-katakana)
 (define-key map "H" 'kkc-hiragana)
 ;; LEN.  If no conversion is found in the dictionary, don't change
 ;; kkc-current-conversions and return nil.
 ;; Postfixes are handled only if POSTFIX is non-nil.
 (defun kkc-lookup-key (len &optional postfix prefer-noun)
 ;; At first, prepare cache data if any.
-(if (not kkc-init-file-flag)
+(unless kkc-init-file-flag
-(progn
+(setq kkc-init-file-flag t
-	(setq kkc-init-file-flag t)
+	  kkc-lookup-cache nil)
-	(add-hook 'kill-emacs-hook 'kkc-save-init-file)
+(add-hook 'kill-emacs-hook 'kkc-save-init-file)
-	(if (file-readable-p kkc-init-file-name)
+(if (file-readable-p kkc-init-file-name)
-	    (condition-case nil
+	(condition-case nil
-		(load-file "~/.kkcrc")
+	    (load-file kkc-init-file-name)
-	      (error (message "Invalid data in %s" kkc-init-file-name)
+	  (kkc-error "Invalid data in %s" kkc-init-file-name))))
-		     (ding))))))
+(or (and (nested-alist-p kkc-lookup-cache)
+	   (eq (car kkc-lookup-cache) kkc-lookup-cache-tag))
+(setq kkc-lookup-cache (list kkc-lookup-cache-tag)
+	    kkc-init-file-flag 'kkc-lookup-cache))
 (let ((entry (lookup-nested-alist kkc-current-key kkc-lookup-cache len 0 t)))
 (if (consp (car entry))
 	(setq kkc-length-converted len
 	      kkc-current-conversions-width nil
 	      kkc-current-conversions (car entry))
 	(if (= len 1)
 	    (setq kkc-length-converted 1
 		  kkc-current-conversions-width nil
 		  kkc-current-conversions (cons 0 nil)))))))
+(put 'kkc-error 'error-conditions '(kkc-error error))
+(defun kkc-error (&rest args)
+(signal 'kkc-error (apply 'format args)))
 (defvar kkc-converting nil)
 ;;;###autoload
 (defun kkc-region (from to)
 "Convert Kana string in the current region to Kanji-Kana mixed string.
 (setq kkc-current-key (string-to-vector kkc-original-kana))
 (setq kkc-length-head (length kkc-current-key))
 (setq kkc-length-converted 0)
-;; At first convert the region to the first candidate.
-(let ((first t))
-(while (not (kkc-lookup-key kkc-length-head nil first))
-(setq kkc-length-head (1- kkc-length-head)
-	    first nil))
-(goto-char to)
-(kkc-update-conversion 'all))
-;; Then, ask users to selecte a desirable conversion.
 (unwind-protect
+;; At first convert the region to the first candidate.
 (let ((current-input-method-title kkc-input-method-title)
-	    (input-method-function nil))
+	    (input-method-function nil)
+	    (first t))
+	(while (not (kkc-lookup-key kkc-length-head nil first))
+	  (setq kkc-length-head (1- kkc-length-head)
+		first nil))
+	(goto-char to)
+	(kkc-update-conversion 'all)
+	;; Then, ask users to selecte a desirable conversion.
 	(force-mode-line-update)
 	(setq kkc-converting t)
 	(while kkc-converting
 	  (let* ((echo-keystrokes 0)
 		 (keyseq (read-key-sequence nil))
 (defun kkc-shorter ()
 "Make the Kana string to be converted shorter."
 (interactive)
 (if (<= kkc-length-head 1)
-(error "Can't be shorter")
+(kkc-error "Can't be shorter"))
 (setq kkc-length-head (1- kkc-length-head))
 (if (> kkc-length-converted kkc-length-head)
-	(let ((len kkc-length-head))
+(let ((len kkc-length-head))
-	  (setq kkc-length-converted 0)
+	(setq kkc-length-converted 0)
-	  (while (not (kkc-lookup-key len))
+	(while (not (kkc-lookup-key len))
-	    (setq len (1- len)))))
+	  (setq len (1- len)))))
-(kkc-update-conversion 'all)))
+(kkc-update-conversion 'all))
 (defun kkc-longer ()
 "Make the Kana string to be converted longer."
 (interactive)
 (if (>= kkc-length-head (length kkc-current-key))
-(error "Can't be longer")
+(kkc-error "Can't be longer"))
 (setq kkc-length-head (1+ kkc-length-head))
 ;; This time, try also entries with postfixes.
 (kkc-lookup-key kkc-length-head 'postfix)
-(kkc-update-conversion 'all)))
+(kkc-update-conversion 'all))
+(defun kkc-shorter-conversion ()
+"Make the Kana string to be converted shorter."
+(interactive)
+(if (<= kkc-length-converted 1)
+(kkc-error "Can't be shorter"))
+(let ((len (1- kkc-length-converted)))
+(setq kkc-length-converted 0)
+(while (not (kkc-lookup-key len))
+(setq len (1- len))))
+(kkc-update-conversion 'all))
+(defun kkc-longer-phrase ()
+"Make the current phrase (BUNSETSU) longer without looking up dictionary."
+(interactive)
+(if (>= kkc-length-head (length kkc-current-key))
+(kkc-error "Can't be longer"))
+(setq kkc-length-head (1+ kkc-length-head))
+(kkc-update-conversion 'all))
 (defun kkc-next-phrase ()
 "Fix the currently converted string and try to convert the remaining string."
 (interactive)
 (if (>= kkc-length-head (length kkc-current-key))
 "Show list of available conversions in echo area with index numbers.
 If the list is already shown, show the next group of conversions,
 and change the current conversion to the first one in the group."
 (interactive)
 (if (< (length kkc-current-conversions) 3)
-(error "No alternative"))
+(kkc-error "No alternative"))
 (if kkc-current-conversions-width
 (let ((next-idx (aref (aref kkc-current-conversions-width 0) 1)))
 	(if (< next-idx (length kkc-current-conversions-width))
 	    (setcar kkc-current-conversions next-idx)
 	  (setcar kkc-current-conversions 1))
 "Show list of available conversions in echo area with index numbers.
 If the list is already shown, show the previous group of conversions,
 and change the current conversion to the last one in the group."
 (interactive)
 (if (< (length kkc-current-conversions) 3)
-(error "No alternative"))
+(kkc-error "No alternative"))
 (if kkc-current-conversions-width
 (let ((this-idx (aref (aref kkc-current-conversions-width 0) 0)))
 	(if (> this-idx 1)
 	    (setcar kkc-current-conversions (1- this-idx))
 	  (setcar kkc-current-conversions

Mercurial > emacs

comparison lisp/international/kkc.el @ 22888:5bfe86125303