From 734c603cca35ad191eb7be582eadfaffffe3ad2c Mon Sep 17 00:00:00 2001 From: Tsuyoshi Kitamoto Date: Sun, 9 Jul 2017 10:08:33 +0900 Subject: [PATCH] Fix indent --- ChangeLog | 6 ++++ skk-annotation.el | 73 +++++++++++++++++++++-------------------------- skk.el | 3 +- 3 files changed, 40 insertions(+), 42 deletions(-) diff --git a/ChangeLog b/ChangeLog index ed3144ea..ab20fc0c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2017-07-09 Tsuyoshi Kitamoto + + * skk-annotation.el (skk-annotation-wait-for-input): Fix indent. + + * skk.el (skk-compile-rule-list): Fix indent. + 2017-07-09 Tsuyoshi Kitamoto * SKK-MK (SKK-MK-export-to-texinfo): `{' と `}' に 接頭辞 `@' を追加. diff --git a/skk-annotation.el b/skk-annotation.el index 4667025d..f5a90c7f 100644 --- a/skk-annotation.el +++ b/skk-annotation.el @@ -710,9 +710,8 @@ NO-PREVIOUS-ANNOTATION $B$r;XDj(B (\\[Universal-Argument] \\[skk-annotation-ad event key command urls note cache char digit exit) (while (and (not exit) list - (or (memq this-command - '(skk-annotation-wikipedia-region-or-at-point - skk-annotation-lookup-region-or-at-point)) + (or (memq this-command '(skk-annotation-wikipedia-region-or-at-point + skk-annotation-lookup-region-or-at-point)) (eq skk-henkan-mode 'active)) (if digit t @@ -724,17 +723,14 @@ NO-PREVIOUS-ANNOTATION $B$r;XDj(B (\\[Universal-Argument] \\[skk-annotation-ad (progn (setq event (next-command-event) key (skk-event-key event) - command (key-binding - (if (featurep 'xemacs) event key))) + command (key-binding (if (featurep 'xemacs) event key))) ;; Return value of the following expression is important. (or (memq command list) (eq command 'digit-argument) - (memq command - '(skk-annotation-wikipedia-region-or-at-point - skk-annotation-lookup-region-or-at-point)) + (memq command '(skk-annotation-wikipedia-region-or-at-point + skk-annotation-lookup-region-or-at-point)) (equal (key-description key) - (key-description - skk-annotation-wikipedia-key)))) + (key-description skk-annotation-wikipedia-key)))) (quit (when (eval-when-compile (and (featurep 'xemacs) (= emacs-major-version 21) @@ -767,46 +763,43 @@ NO-PREVIOUS-ANNOTATION $B$r;XDj(B (\\[Universal-Argument] \\[skk-annotation-ad (when url (setq urls (cons url urls))))) (unless (equal annotation "") - (cond - (urls - (dolist (url urls) - (cond ((consp url) - (setq exit t) - (apply (car url) (cdr url))) - (t - (browse-url url)))) - (skk-message "$BCm digit 0) - (<= digit - (length skk-annotation-other-sources))) - (list (nth (1- digit) - skk-annotation-other-sources)) - skk-annotation-other-sources)) + (memq command '(skk-annotation-wikipedia-region-or-at-point + skk-annotation-lookup-region-or-at-point))) + (setq sources (if (and digit + (> digit 0) + (<= digit + (length skk-annotation-other-sources))) + (list (nth (1- digit) + skk-annotation-other-sources)) + skk-annotation-other-sources)) (setq event nil digit nil char nil) diff --git a/skk.el b/skk.el index b6d710af..4c7e2688 100644 --- a/skk.el +++ b/skk.el @@ -1416,8 +1416,7 @@ CHAR-LIST $B$N;D$j$HC)$l$J$/$J$C$?@aE@$NLZ$NAH$rJV$9!#(B" (setq rule (cons key (cdr rule))))) (unless (or (not (stringp key)) (string-match "\\w" key) - (eq (key-binding key) - 'self-insert-command)) + (eq (key-binding key) 'self-insert-command)) (define-key skk-j-mode-map key 'skk-insert))) (when (stringp key) (skk-add-rule tree rule))))