Resolves: #1998727 Fix emacs-anthy-unicode

This commit is contained in:
Takao Fujiwara 2021-10-26 18:21:50 +09:00
parent d537fcb574
commit 146231c553
2 changed files with 40 additions and 7 deletions

View File

@ -6983,9 +6983,9 @@ index c34aa64..de3313a 100644
--
2.28.0
From e54c7582bc7284575c12827a9685c5ab08cb2674 Mon Sep 17 00:00:00 2001
From 3268769dcf9599d0275b82edf88b9f8ac6d51891 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 26 Oct 2021 16:30:00 +0900
Date: Tue, 26 Oct 2021 18:16:12 +0900
Subject: [PATCH] src-util: Fix require in *.el
BUG=rhbz#1998727
@ -6995,8 +6995,8 @@ BUG=rhbz#1998727
src-util/anthy-unicode-dic.el | 6 +++---
src-util/anthy-unicode-isearch.el | 4 ++--
src-util/anthy-unicode-kyuri.el | 4 ++--
src-util/anthy-unicode.el | 11 +++++++----
6 files changed, 18 insertions(+), 15 deletions(-)
src-util/anthy-unicode.el | 23 +++++++++++++----------
6 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/src-util/anthy-unicode-azik.el b/src-util/anthy-unicode-azik.el
index 935d4d8..019c082 100644
@ -7088,7 +7088,7 @@ index 6fb2575..4ccdd1a 100644
(setq anthy-kyuri-mode-hiragana-map
'(
diff --git a/src-util/anthy-unicode.el b/src-util/anthy-unicode.el
index 218d489..a913f87 100644
index 218d489..14a9db4 100644
--- a/src-util/anthy-unicode.el
+++ b/src-util/anthy-unicode.el
@@ -1,6 +1,8 @@
@ -7109,6 +7109,39 @@ index 218d489..a913f87 100644
;;
;; TODO
;; 候補選択モードで候補をいっきに次のページにいかないようにする (2chスレ78)
@@ -860,26 +863,26 @@
;;
;; leim の inactivate
;;
-(defun anthy-leim-inactivate ()
+(defun anthy-unicode-leim-inactivate ()
(setq anthy-leim-active-p nil)
(anthy-update-mode))
;;
;; leim の activate
;;
-(defun anthy-leim-activate (&optional name)
- (setq deactivate-current-input-method-function 'anthy-leim-inactivate)
+(defun anthy-unicode-leim-activate (&optional name)
+ (setq deactivate-current-input-method-function 'anthy-unicode-leim-inactivate)
(setq anthy-leim-active-p t)
(anthy-update-mode)
(when (eq (selected-window) (minibuffer-window))
- (add-hook 'minibuffer-exit-hook 'anthy-leim-exit-from-minibuffer)))
+ (add-hook 'minibuffer-exit-hook 'anthy-unicode-leim-exit-from-minibuffer)))
;;
;; emacsのバグ避けらしいです
;;
-(defun anthy-leim-exit-from-minibuffer ()
+(defun anthy-unicode-leim-exit-from-minibuffer ()
(deactivate-input-method)
(when (<= (minibuffer-depth) 1)
- (remove-hook 'minibuffer-exit-hook 'anthy-leim-exit-from-minibuffer)))
+ (remove-hook 'minibuffer-exit-hook 'anthy-unicode-leim-exit-from-minibuffer)))
;;
;; Emacs / XEmacs コンパチブルな last-command-char
@@ -901,10 +904,10 @@
;;
;;

View File

@ -4,7 +4,7 @@
Name: anthy-unicode
Version: 1.0.0.20201109
Release: 9%{?dist}
Release: 10%{?dist}
# The entire source code is LGPLv2+ and dictionaries is GPLv2. the corpus data is under Public Domain.
License: LGPLv2+ and GPLv2 and Public Domain
URL: https://github.com/fujiwarat/anthy-unicode/wiki
@ -161,7 +161,7 @@ cd ..
%changelog
* Tue Oct 26 2021 Takao Fujiwara <fujiwara@redhat.com> 1.0.0.20201109-9
* Tue Oct 26 2021 Takao Fujiwara <fujiwara@redhat.com> 1.0.0.20201109-10
- Resolves: #1998727 Fix emacs-anthy-unicode
* Thu Oct 21 2021 Takao Fujiwara <fujiwara@redhat.com> 1.0.0.20201109-8