68 lines
2.1 KiB
Text
68 lines
2.1 KiB
Text
- old-style backquotes are obsolete
|
||
- last-command-char is obsolete
|
||
|
||
Index: src-util/anthy.el
|
||
--- src-util/anthy.el.orig
|
||
+++ src-util/anthy.el
|
||
@@ -71,7 +71,7 @@
|
||
(defvar anthy-highlight-face nil)
|
||
(defvar anthy-underline-face nil)
|
||
(copy-face 'highlight 'anthy-highlight-face)
|
||
-(set-face-underline-p 'anthy-highlight-face t)
|
||
+(set-face-underline 'anthy-highlight-face t)
|
||
(copy-face 'underline 'anthy-underline-face)
|
||
|
||
;;
|
||
@@ -161,11 +161,11 @@
|
||
|
||
;; From skk-macs.el From viper-util.el. Welcome!
|
||
(defmacro anthy-deflocalvar (var default-value &optional documentation)
|
||
- (` (progn
|
||
- (defvar (, var) (, default-value)
|
||
- (, (format "%s\n\(buffer local\)" documentation)))
|
||
- (make-variable-buffer-local '(, var))
|
||
- )))
|
||
+ `(progn
|
||
+ (defvar ,var ,default-value
|
||
+ ,(format "%s\n\(buffer local\)" documentation))
|
||
+ (make-variable-buffer-local ',var)
|
||
+ ))
|
||
|
||
;; buffer local variables
|
||
(anthy-deflocalvar anthy-context-id nil "$B%3%s%F%-%9%H$N(Bid")
|
||
@@ -745,7 +745,7 @@
|
||
(if anthy-agent-process
|
||
(kill-process anthy-agent-process))
|
||
(setq anthy-agent-process proc)
|
||
- (process-kill-without-query proc)
|
||
+ (set-process-query-on-exit-flag proc nil)
|
||
(if anthy-xemacs
|
||
(if (coding-system-p (find-coding-system 'euc-japan))
|
||
(set-process-coding-system proc 'euc-japan 'euc-japan))
|
||
@@ -864,7 +864,7 @@
|
||
;; leim $B$N(B activate
|
||
;;
|
||
(defun anthy-leim-activate (&optional name)
|
||
- (setq inactivate-current-input-method-function 'anthy-leim-inactivate)
|
||
+ (setq deactivate-current-input-method-function 'anthy-leim-inactivate)
|
||
(setq anthy-leim-active-p t)
|
||
(anthy-update-mode)
|
||
(when (eq (selected-window) (minibuffer-window))
|
||
@@ -874,7 +874,7 @@
|
||
;; emacs$B$N%P%0Hr$1$i$7$$$G$9(B
|
||
;;
|
||
(defun anthy-leim-exit-from-minibuffer ()
|
||
- (inactivate-input-method)
|
||
+ (deactivate-input-method)
|
||
(when (<= (minibuffer-depth) 1)
|
||
(remove-hook 'minibuffer-exit-hook 'anthy-leim-exit-from-minibuffer)))
|
||
|
||
@@ -892,7 +892,7 @@
|
||
((event-matches-key-specifier-p event 'backspace) 8)
|
||
(t
|
||
(char-to-int (event-to-character event)))))
|
||
- last-command-char))
|
||
+ last-command-event))
|
||
|
||
;;
|
||
;;
|