Merge pull request #123 from tkita/master

remove function next-command-event

ChangeLog

@@ -1,3 +1,14 @@
+2020-02-29  Tsuyoshi Kitamoto  <tsuyoshi.kitamoto@gmail.com>
+
+	* skk-macs.el (next-command-event): Remove function.
+	* skk.el (skk-henkan-show-candidates): Use function read-event() instead of
+	next-command-event().
+	* skk-tut.el (skktut-end-tutorial): Ditto.
+	* skk-sticky.el (skk-insert): Ditto.
+	* skk-kcode.el (skk-input-by-code-or-menu-jump,skk-input-by-code-or-menu-1): Ditto.
+	* skk-isearch.el (skk-isearch-start-henkan): Ditto.
+	* skk-gadget.el (skk-clock): Ditto.
+
 2020-02-29  Tsuyoshi Kitamoto  <tsuyoshi.kitamoto@gmail.com>
 
 	* Makefile (test): テスト実行時に bayesian と tut-code のバイトコンパイルを追加.

skk-annotation.el

@@ -410,7 +410,7 @@
 	  ;;
 	  (skk-annotation-message 'annotation)
 	  ;;
-	  (setq event (next-command-event))
+	  (setq event (read-event))
 	  (when (skk-key-binding-member (skk-event-key event)
 					'(key-board-quit
 					  skk-kanagaki-bs
@@ -727,7 +727,7 @@ NO-PREVIOUS-ANNOTATION $B$r;XDj(B (\\[Universal-Argument] \\[skk-annotation-ad
 					    nil)))
 		(condition-case nil
 		    (progn
-		      (setq event (next-command-event)
+		      (setq event (read-event)
 			    key (skk-event-key event)
 			    command (key-binding key))
 		      ;; Return value of the following expression is important.

skk-gadget.el

@@ -312,11 +312,11 @@ interactive $B$K5/F0$9$kB>!"(B\"clock /(skk-clock)/\" $B$J$I$N%(%s%H%j$r(B S
 		    (ding)
 		    (unless (sit-for (setq sec (+ sec 0.16))
 				     'nodisplay)
-		      (next-command-event)
+		      (read-event)
 		      (signal 'quit nil))
 		    (ding)))))
 	      (unless (sit-for (- 1 sec) 'nodisplay)
-		(next-command-event)
+		(read-event)
 		(signal 'quit nil))))
 	(quit
 	 (prog2

skk-isearch.el

@@ -669,7 +669,7 @@ If the current mode is different from previous, remove it first."
   (interactive)
   (let ((digit (or digit
 		   (- (logand last-command-event ?\177) ?0)))
-	(event (next-command-event nil (skk-isearch-incomplete-message))))
+	(event (read-event (skk-isearch-incomplete-message))))
     (cond ((equal event ?\ )
            ;; XEmacs $B$G$O(B eq $B$K$O$J$i$J$$(B
            (with-current-buffer (get-buffer-create skk-isearch-working-buffer)

skk-kcode.el

@@ -248,7 +248,7 @@ To find a character in `%s', type 7/8 bits JIS code (00nn),\
 	       (funcall skk-tooltip-function str)
 	     (message "%s" str)))
 	 ;;
-	 (let* ((event (next-command-event))
+	 (let* ((event (read-event))
 		(char (event-to-character event))
 		(key (skk-event-key event))
 		rest ch)
@@ -299,7 +299,7 @@ To find a character in `%s', type 7/8 bits JIS code (00nn),\
 	      n-org skk-code-n1-min
 	      (- n-org 128) (- skk-code-n1-min 128)
 	      (- n-org 128) (- skk-code-n1-min 128))
-	     (next-command-event)
+	     (read-event)
 	     (setq n n-org))
 	    ;;
 	    (t
@@ -350,7 +350,7 @@ To find a character in `%s', type 7/8 bits JIS code (00nn),\
 	   (if skk-show-tooltip
 	       (funcall skk-tooltip-function str)
 	     (message "%s" str)))
-	 (let* ((event (next-command-event))
+	 (let* ((event (read-event))
 		(char (event-to-character event))
 		(key (skk-event-key event))
 		rest ch)
@@ -398,7 +398,7 @@ To find a character in `%s', type 7/8 bits JIS code (00nn),\
 	      n1-org n2-org
 	      (- n1-org 128) (- n2-org 128)
 	      (- n1-org 128) (- n2-org 128))
-	     (next-command-event)
+	     (read-event)
 	     (setq n1 n1-org n2 n2-org))
 	    ;;
 	    ((eq char ?>)

skk-macs.el

@@ -228,15 +228,6 @@ If the event isn't a keypress, this returns nil."
       (setq buffer-undo-list (cdr buffer-undo-list))))
 
 ;; For GNU Emacs.
-(defun next-command-event (&optional event prompt)
-  "Read an event object from the input stream.
-If EVENT is non-nil, it should be an event object and will be filled
-in and returned; otherwise a new event object will be created and
-returned.
-If PROMPT is non-nil, it should be a string and will be displayed in
-the echo area while this function is waiting for an event."
-  (read-event prompt))
-
 (defun skk-color-cursor-display-p ()
   (and (skk-find-window-system)
        (fboundp 'x-display-color-p)

skk-sticky.el

@@ -222,7 +222,7 @@
 	 ad-do-it)
 	(t
 	 ;; Some key's pressed.
-	 (let ((next-event (next-command-event)))
+	 (let ((next-event (read-event)))
 	   (if (skk-sticky-double-p this-command
 				    (aref (skk-event-key next-event) 0))
 	       (skk-sticky-set-henkan-point)

skk-tut.el

@@ -1008,7 +1008,7 @@ with both the subject and the body empty.
 			   'face skk-tut-do-it-face)))
     (while (not skktut-tutorial-end)
       (ignore-errors
-	(let* ((event (next-command-event))
+	(let* ((event (read-event))
 	       (char (event-to-character event)))
 	  (skktut-message "<return> $B%-!<$r2!$7$F$/$@$5$$(B"
 			  "Hit <return> key")

skk.el

@@ -1903,7 +1903,7 @@ CHAR-LIST $B$N;D$j$HC)$l$J$/$J$C$?@aE@$NLZ$NAH$rJV$9!#(B"
 	 (setq n (skk-henkan-show-candidate-subr candidate-keys henkan-list))
 	 (when (> n 0)
 	   (condition-case nil
-	       (let* ((event (next-command-event))
+	       (let* ((event (read-event))
 		      (char (event-to-character event))
 		      (key (skk-event-key event))
 		      num)