Fix indent

skk-dev · Jul 9, 2017 · 734c603 · 734c603
1 parent 4465a08
commit 734c603
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 42 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2017-07-09  Tsuyoshi Kitamoto  <tsuyoshi.kitamoto@gmail.com>
+
+	* skk-annotation.el (skk-annotation-wait-for-input): Fix indent.
+
+	* skk.el (skk-compile-rule-list): Fix indent.
+
 2017-07-09  Tsuyoshi Kitamoto  <tsuyoshi.kitamoto@gmail.com>
 
 	* SKK-MK (SKK-MK-export-to-texinfo): `{' と `}' に 接頭辞 `@' を追加.

diff --git 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<a$N%=!<%9$r%V%i%&%:$7$F$$$^$9(B..."
-			      "Browsing originals for the current notes..."))
-		(t
-		 (skk-message "$BCm<a$N%=!<%9$,8+$D$+$j$^$;$s(B"
-			      "No originals found for the current notes")))
+	       (cond (urls
+		      (dolist (url urls)
+		        (cond ((consp url)
+			       (setq exit t)
+			       (apply (car url) (cdr url)))
+			      (t
+			       (browse-url url))))
+		      (skk-message "$BCm<a$N%=!<%9$r%V%i%&%:$7$F$$$^$9(B..."
+			           "Browsing originals for the current notes..."))
+		     (t
+		      (skk-message "$BCm<a$N%=!<%9$,8+$D$+$j$^$;$s(B"
+			           "No originals found for the current notes")))
 	       (setq event nil
 		     digit nil
 		     char  nil)
 	       (unless exit
 		 (skk-annotation-show-2 annotation))))
 	    ((eq command 'digit-argument)
-	     (setq char  (cond ((featurep 'xemacs)
-				key)
-			       ((integerp event)
-				event)
-			       (t
-				(get event 'ascii-character)))
+	     (setq char (cond ((featurep 'xemacs)
+			       key)
+			      ((integerp event)
+			       event)
+			      (t
+			       (get event 'ascii-character)))
 		   digit (- (logand char ?\177) ?0)
 		   event nil))
 	    ((or (equal (key-description key)
 			(key-description skk-annotation-wikipedia-key))
-		 (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))
+		 (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
@@ -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))))