From bcefe49c116b8a959c38e6396e0ac1e46a94546f Mon Sep 17 00:00:00 2001 From: akr Date: Mon, 9 Jul 2001 14:46:38 +0000 Subject: [PATCH] patch-20010524.gz in [tamago:00462] is applied. --- ChangeLog | 20 ++++++++++++++++++++ egg-cnv.el | 5 +++-- egg.el | 11 ++++++++++- egg/canna.el | 4 ++-- its.el | 19 ++++++++++++++----- its/aynu.el | 4 +++- jisx0213.el | 9 +++++++-- 7 files changed, 59 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 699623f..6bc2b6b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,23 @@ +2001-05-22 KATAYAMA Yoshio + + * its.el (its-delete-by-character): New customizable variable. + (its-delete-backward-SYL): Delete a character as a unit even if + just after input, if its-delete-by-character is non-NIL. + +2001-04-16 KATAYAMA Yoshio + + * egg.el (egg-setup-invisibility-spec): New function for setup + buffer-invisibilty-spec. + + * its.el (its-setup-fence-mode): Change the value of invisible + property to egg. + + * egg-cnv.el (egg-convert-region): Change the value of invisible + property to egg. + + * jisx0213.el: Correct JIS X 0213 definition. (suggested by + T. Kawabata) + 2000-06-02 KATAYAMA Yoshio * egg/wnn.el (wnn): Fix docstring. diff --git a/egg-cnv.el b/egg-cnv.el index 7eaa318..5ad9577 100644 --- a/egg-cnv.el +++ b/egg-cnv.el @@ -303,6 +303,7 @@ mode, if non-NIL." ;; nothing to do nil (delete-region start end) + (egg-setup-invisibility-spec) (let ((inhibit-read-only t)) (its-define-select-keys egg-conversion-map) (goto-char start) @@ -317,13 +318,13 @@ mode, if non-NIL." (if context (put-text-property 0 len 'egg-context context s)) (if egg-conversion-fence-invisible - (put-text-property 0 len 'invisible t s)) + (put-text-property 0 len 'invisible 'egg s)) (insert s) (setq s (copy-sequence egg-conversion-fence-close) len (length s)) (set-text-properties 0 len '(read-only t rear-nonsticky t egg-end t) s) (if egg-conversion-fence-invisible - (put-text-property 0 len 'invisible t s)) + (put-text-property 0 len 'invisible 'egg s)) (insert s) (goto-char start) (insert source) diff --git a/egg.el b/egg.el index 69f4503..7bd4f3c 100644 --- a/egg.el +++ b/egg.el @@ -30,7 +30,9 @@ ;;; Code: -(require 'cl) +(eval-when-compile + (require 'cl)) + (require 'egg-edep) (autoload 'egg-simple-input-method "egg-sim" @@ -192,6 +194,13 @@ (setq prop (cddr prop))) (setq p (next-property-change p object to))) (remove-text-properties from to props object))) + +(defun egg-setup-invisibility-spec () + (if (listp buffer-invisibility-spec) + (unless (condition-case nil (memq 'egg buffer-invisibility-spec) (error)) + (setq buffer-invisibility-spec (cons 'egg buffer-invisibility-spec))) + (unless (eq buffer-invisibility-spec t) + (setq buffer-invisibility-spec (list 'egg buffer-invisibility-spec))))) (defvar egg-mark-list nil) (defvar egg-suppress-marking nil) diff --git a/egg/canna.el b/egg/canna.el index d6ab041..205ff17 100644 --- a/egg/canna.el +++ b/egg/canna.el @@ -645,7 +645,7 @@ Return the list of bunsetsu." (if (y-or-n-p (concat "「" kanji "な」は正しいですか。")) "#T15" "#T35")) (defun canna-hinshi-SAHEN-MEISHI (kanji yomi) - (if (y-or-n-p (concat "「" kanji "な」は正しいですか。") "#T10" "#T30"))) + (if (y-or-n-p (concat "「" kanji "な」は正しいですか。")) "#T10" "#T30")) (defmacro canna-hinshi-DOUSHI-check-gobi () '(progn @@ -875,7 +875,7 @@ Return the list of bunsetsu." (cannarpc-close-context envd) (list kanji yomi (canna-hinshi-name hinshi) dic)) (cannarpc-close-context envd) - (egg-error (cannarpc-get-error-message (- result)))) + (egg-error "削除されませんでした。")) )) ;;; setup diff --git a/its.el b/its.el index d651451..def657d 100644 --- a/its.el +++ b/its.el @@ -31,7 +31,9 @@ ;;; Code: -(require 'cl) +(eval-when-compile + (require 'cl)) + (require 'egg-edep) (defgroup its nil @@ -47,7 +49,13 @@ :group 'its :type 'boolean) (defcustom its-delete-by-keystroke nil - "*Delete characters as if cancel input keystroke, if nin-NIL." + "*Delete characters as if cancel input keystroke, if nin-NIL. +This variable is overriden by `its-delete-by-character'." + :group 'its :type 'boolean) + +(defcustom its-delete-by-character nil + "*Delete a character as a unit even if just after input, if nin-NIL. +This variable override `its-delete-by-keystroke'." :group 'its :type 'boolean) (defcustom its-fence-invisible nil @@ -314,7 +322,7 @@ (let ((p (point)) (str (copy-sequence "!"))) (set-text-properties 0 1 (list 'read-only t - 'invisible t + 'invisible 'egg 'intangible 'its-part-2 'its-cursor cursor 'point-entered 'egg-enter/leave-fence @@ -352,6 +360,7 @@ (error "invalid fence")) ;; Put open-fence before inhibit-read-only to detect read-only (insert (if its-context its-fence-continue its-fence-open)) + (egg-setup-invisibility-spec) (let ((inhibit-read-only t)) (setq p1 (point)) (add-text-properties p p1 open-props) @@ -360,7 +369,7 @@ (insert its-fence-close) (add-text-properties p1 (point) close-props) (if its-fence-invisible - (put-text-property p (point) 'invisible t)) + (put-text-property p (point) 'invisible 'egg)) (put-text-property p (point) 'read-only t) (goto-char p1) (its-define-select-keys its-mode-map t) @@ -1010,7 +1019,7 @@ Return last state." (cursor (get-text-property (point) 'its-cursor))) (if (null syl) (signal 'beginning-of-buffer nil) - (if (eq cursor t) + (if (or (eq cursor t) (and cursor its-delete-by-character)) (its-delete-backward-SYL-internal n killflag) (its-delete-backward-within-SYL syl n killflag))))) diff --git a/its/aynu.el b/its/aynu.el index 42ac872..bd39186 100644 --- a/its/aynu.el +++ b/its/aynu.el @@ -30,7 +30,9 @@ ;;; Code: -(require 'its) +(eval-when-compile + (require 'its) + (require 'cl)) (eval-when (compile) (defconst its-compaction-enable t)) diff --git a/jisx0213.el b/jisx0213.el index 7a17790..9da290c 100644 --- a/jisx0213.el +++ b/jisx0213.el @@ -30,5 +30,10 @@ ;;; Code: -(define-charset nil 'japanese-jisx0213 - [2 94 2 0 ?O 0 "JIS X 0213" "JIS X 0213" "JIS X 0213"]) +(unless (charsetp 'japanese-jisx0213-1) + (define-charset 151 'japanese-jisx0213-1 + [2 94 2 0 ?O 0 "JISX0213-1" "JISX0213-1" "JISX0213-1 (Japanese)"])) + +(unless (charsetp 'japanese-jisx0213-2) + (define-charset 254 'japanese-jisx0213-2 + [2 94 2 0 ?P 0 "JISX0213-2" "JISX0213-2" "JISX0213-2 (Japanese)"])) -- 1.7.10.4