Skip to content

Commit 6d7d16a

Browse files
authored
Drop removed funcs (#19)
* change input-method-inactivate-hook to input-method-deactivate-hook input-method-inactivate-hook obsolete since emacs 24 and removed on emacs 29. Use the new one. https://git.savannah.gnu.org/cgit/emacs.git/tree/etc/NEWS?h=emacs-29 Note that one in tc-sysdep.el kept intact, but it will be removed in a following commit. Reference: #17 * change inactivate-current-input-method-function to deactivate-current-input-method-function inactivate-current-input-method-function obsolete since emacs 24 and removed on emacs 29. Use the new one. https://git.savannah.gnu.org/cgit/emacs.git/tree/etc/NEWS?h=emacs-29 Note that one in tc-sysdep.el kept intact, but it will be removed in a following commit. Reference: #17 * change set-face-underline-p to set-face-underline set-face-underline-p obsolete since emacs 24 and removed on emacs 29. Use the new one. https://git.savannah.gnu.org/cgit/emacs.git/tree/etc/NEWS?h=emacs-29 Reference: #17
1 parent d0adf22 commit 6d7d16a

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

tc-ja-alnum.el

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
(unwind-protect
5454
(progn
5555
(setq tcode-2byte-alnum-mode nil)
56-
(run-hooks 'input-method-inactivate-hook))
56+
(run-hooks 'input-method-deactivate-hook))
5757
(setq input-method-function nil))
5858
;; activate T-Code mode
5959
(setq tcode-2byte-alnum-mode t)
@@ -65,7 +65,7 @@
6565

6666
;;;###autoload
6767
(defun tcode-use-2byte-alnum (package-name &rest libraries)
68-
(setq inactivate-current-input-method-function 'tcode-2byte-alnum-inactivate
68+
(setq deactivate-current-input-method-function 'tcode-2byte-alnum-inactivate
6969
describe-current-input-method-function nil
7070
current-input-method package-name)
7171
(tcode-2byte-alnum-mode 1))

tc-mazegaki.el

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ nil の場合には保存されない。")
9191
nil
9292
(prog1
9393
(make-face 'mazegaki-conversion)
94-
(set-face-underline-p 'mazegaki-conversion t)))
94+
(set-face-underline 'mazegaki-conversion t)))
9595
"* 交ぜ書き変換の変換対象を表す文字列に用いるface。
9696
mule2 以上または XEmacs の場合のみ有効。")
9797
(defvar tcode-mazegaki-prefix-overlay nil)

tc.el

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1142,7 +1142,7 @@ Tコードモードについては、\\[tcode-mode-help] で表示されるヘ
11421142
(setq tcode-mode nil
11431143
tcode-self-insert-non-undo-count 1)
11441144
(tcode-clear)
1145-
(run-hooks 'input-method-inactivate-hook))
1145+
(run-hooks 'input-method-deactivate-hook))
11461146
(setq input-method-function nil))
11471147
;; activate T-Code mode
11481148
(if (window-minibuffer-p (selected-window))
@@ -1201,7 +1201,7 @@ The remaining arguments are libraries to be loaded before using the package."
12011201
(setq libraries (cdr libraries)))
12021202
(tcode-load-table table-name))
12031203
(setq tcode-current-package package-name))
1204-
(setq inactivate-current-input-method-function 'tcode-inactivate
1204+
(setq deactivate-current-input-method-function 'tcode-inactivate
12051205
describe-current-input-method-function 'tcode-mode-help)
12061206
(setq current-input-method-title 'tcode-mode-indicator)
12071207
(tcode-activate))

0 commit comments

Comments
 (0)