X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/b14e3e21ec6702d27257a1400681fc36ee10282f..090fb90d96046d7f9e4d70b9d7b14894e2a187a5:/lisp/international/robin.el

diff --git a/lisp/international/robin.el b/lisp/international/robin.el
index 7e98a507f9..0ef90b1893 100644
--- a/lisp/international/robin.el
+++ b/lisp/international/robin.el
@@ -22,7 +22,7 @@
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
-;;; Comentary:
+;;; Commentary:
 
 ;; Functionalities
 ;; ---------------
@@ -50,9 +50,9 @@
 ;; identified by a string called package name.  Use robin-define-package
 ;; to define a robin package.
 
-;; (robin-define-package NAME DOCTSTRING
-;;   (INPUT1 OUPUT1)
-;;   (INPUT2 OUPUT2)
+;; (robin-define-package NAME DOCSTRING
+;;   (INPUT1 OUTPUT1)
+;;   (INPUT2 OUTPUT2)
 ;;   ...)
 
 ;; NAME is a string identifying the robin package.  It often starts with a
@@ -127,7 +127,7 @@
 
 ;; Use the symbol `robin-use-package' as the third argument.
 
-;; The fourth argument is the prompt that appears in modeline when this
+;; The fourth argument is the prompt that appears in mode line when this
 ;; input method is active.
 
 ;; The fifth argument is a documentation string; it may or may not be
@@ -229,7 +229,7 @@
 ;; As stated in Murphy's law, it took longer than expected to develop the
 ;; very first version of Japanese input subsystem in NEmacs (Nihongo
 ;; Emacs).  So the subsystem was named "TAMAGO", which is an acronym of
-;; "TAkusan Matasete GOmennasai" (Sorry to have kept you waiting so
+;; "TAkusan Matasete GOmen-nasai" (Sorry to have kept you waiting so
 ;; long).  "Tamago" as a Japanese word means "egg", so the word "egg" was
 ;; also used for related filenames and function names.
 
@@ -390,12 +390,14 @@ A nil value means no package is selected.")
     (setq robin-current-package-name name)
     (robin-activate)))
 
-(defun robin-inactivate ()
-  "Inactivate robin input method."
+(defun robin-deactivate ()
+  "Deactivate robin input method."
 
   (interactive)
   (robin-activate -1))
 
+(define-obsolete-function-alias 'robin-inactivate 'robin-deactivate "24.3")
+
 (defun robin-activate (&optional arg)
   "Activate robin input method.
 
@@ -406,18 +408,20 @@ While this input method is active, the variable
   (if (and arg
 	   (< (prefix-numeric-value arg) 0))
 
-      ;; inactivate robin input method.
+      ;; deactivate robin input method.
       (unwind-protect
 	  (progn
 	    (setq robin-mode nil)
 	    (setq describe-current-input-method-function nil)
-	    (run-hooks 'robin-inactivate-hook))
+	    (run-hooks
+	     'robin-inactivate-hook ; for backward compatibility
+	     'robin-deactivate-hook))
 	(kill-local-variable 'input-method-function))
 
     ;; activate robin input method.
     (setq robin-mode t
       	  describe-current-input-method-function 'robin-help
-	  inactivate-current-input-method-function 'robin-inactivate)
+	  deactivate-current-input-method-function 'robin-deactivate)
     (if (eq (selected-window) (minibuffer-window))
 	(add-hook 'minibuffer-exit-hook 'robin-exit-from-minibuffer))
     (run-hooks 'input-method-activate-hook
@@ -425,8 +429,12 @@ While this input method is active, the variable
     (set (make-local-variable 'input-method-function)
 	 'robin-input-method)))
 
+(define-obsolete-variable-alias
+  'robin-inactivate-hook
+  'robin-deactivate-hook "24.3")
+
 (defun robin-exit-from-minibuffer ()
-  (inactivate-input-method)
+  (deactivate-input-method)
   (if (<= (minibuffer-depth) 1)
       (remove-hook 'minibuffer-exit-hook 'robin-exit-from-minibuffer)))
 
@@ -458,7 +466,7 @@ While this input method is active, the variable
 	  (list key)
 	(delete-region start (point))
 	(if key
-	    (setq unread-command-events (list key)))
+	    (push key unread-command-events))
 	(if (stringp output)
 	    (string-to-list output)
 	  (list output))))))
@@ -568,7 +576,7 @@ used."
 (provide 'robin)
 
 ;; Local Variables:
-;; coding: utf-8-emacs
+;; coding: utf-8
 ;; End:
 
 ;;; robin.el ends here