diff options
Diffstat (limited to 'lisp/international/quail.el')
| -rw-r--r-- | lisp/international/quail.el | 65 |
1 files changed, 35 insertions, 30 deletions
diff --git a/lisp/international/quail.el b/lisp/international/quail.el index 245f7975d91..01676ac4fba 100644 --- a/lisp/international/quail.el +++ b/lisp/international/quail.el @@ -1,6 +1,6 @@ ;;; quail.el --- provides simple input method for multilingual text -;; Copyright (C) 1997-1998, 2000-2013 Free Software Foundation, Inc. +;; Copyright (C) 1997-1998, 2000-2015 Free Software Foundation, Inc. ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) @@ -202,7 +202,7 @@ It is an alist of translations and corresponding keys." See also the documentation of `quail-define-package'." (nth 11 quail-current-package)) (defsubst quail-overlay-plist () - "Return property list of an overly used in the current Quail package." + "Return property list of an overlay used in the current Quail package." (nth 12 quail-current-package)) (defsubst quail-update-translation-function () "Return a function for updating translation in the current Quail package." @@ -252,15 +252,16 @@ This activates input method defined by PACKAGE-NAME by running (with-output-to-temp-buffer "*Help*" (princ "Quail package \"") (princ package-name) - (princ "\" can't be activated\n because library \"") + (princ (substitute-command-keys + "\" can't be activated\n because library \"")) (princ (car libraries)) - (princ "\" is not in `load-path'. + (princ (substitute-command-keys "\" is not in `load-path'. The most common case is that you have not yet installed appropriate libraries in LEIM (Libraries of Emacs Input Method) which is distributed separately from Emacs. -LEIM is available from the same ftp directory as Emacs.")) +LEIM is available from the same ftp directory as Emacs."))) (error "Can't use the Quail package `%s'" package-name)) (setq libraries (cdr libraries)))))) (quail-select-package package-name) @@ -445,10 +446,11 @@ user's keyboard layout to the standard keyboard layout. See the documentation of `quail-keyboard-layout' and `quail-keyboard-layout-standard' for more detail. -SHOW-LAYOUT non-nil means the `quail-help' command should show -the user's keyboard layout visually with translated characters. -If KBD-TRANSLATE is set, it is desirable to set also this flag unless -this package defines no translations for single character keys. +SHOW-LAYOUT non-nil means the function `quail-help' (as used by +the command `describe-input-method') should show the user's keyboard +layout visually with translated characters. If KBD-TRANSLATE is +set, it is desirable to also set this flag, unless this package +defines no translations for single character keys. CREATE-DECODE-MAP non-nil means decode map is also created. A decode map is an alist of translations and corresponding original keys. @@ -624,7 +626,7 @@ While this input method is active, the variable "Standard keyboard layout of printable characters Quail assumes. See the documentation of `quail-keyboard-layout' for this format. This layout is almost the same as that of VT100, - but the location of key \\ (backslash) is just right of key ' (single-quote), + but the location of key \\ (backslash) is just right of key \\=' (single-quote), not right of RETURN key.") (defconst quail-keyboard-layout-len 180) @@ -792,9 +794,10 @@ you type is correctly handled." keyseq))) (defun quail-insert-kbd-layout (kbd-layout) -"Insert the visual keyboard layout table according to KBD-LAYOUT. + "Insert the visual keyboard layout table according to KBD-LAYOUT. The format of KBD-LAYOUT is the same as `quail-keyboard-layout'." (let (done-list layout i ch) + (setq bidi-paragraph-direction 'left-to-right) ;; At first, convert KBD-LAYOUT to the same size vector that ;; contains translated character or string. (setq layout (string-to-vector kbd-layout) @@ -1303,7 +1306,7 @@ The returned value is a Quail map specific to KEY." (define-error 'quail-error nil) (defun quail-error (&rest args) - (signal 'quail-error (apply 'format args))) + (signal 'quail-error (apply #'format-message args))) (defun quail-input-string-to-events (str) "Convert input string STR to a list of events. @@ -1334,9 +1337,7 @@ If STR has `advice' text property, append the following special event: overriding-local-map) (list key) (quail-setup-overlays (quail-conversion-keymap)) - (let ((modified-p (buffer-modified-p)) - (buffer-undo-list t) - (inhibit-modification-hooks t)) + (with-silent-modifications (unwind-protect (let ((input-string (if (quail-conversion-keymap) (quail-start-conversion key) @@ -1348,7 +1349,6 @@ If STR has `advice' text property, append the following special event: (list (aref input-string 0)) (quail-input-string-to-events input-string)))) (quail-delete-overlays) - (set-buffer-modified-p modified-p) ;; Run this hook only when the current input method doesn't require ;; conversion. When conversion is required, the conversion function ;; should run this hook at a proper timing. @@ -1416,7 +1416,8 @@ Return the input string." ;; KEYSEQ is not defined in the translation keymap. ;; Let's return the event(s) to the caller. (setq unread-command-events - (string-to-list (this-single-command-raw-keys))) + (append (this-single-command-raw-keys) + unread-command-events)) (setq quail-translating nil)))) (quail-delete-region) quail-current-str) @@ -1492,7 +1493,8 @@ Return the input string." ;; KEYSEQ is not defined in the conversion keymap. ;; Let's return the event(s) to the caller. (setq unread-command-events - (string-to-list (this-single-command-raw-keys))) + (append (this-single-command-raw-keys) + unread-command-events)) (setq quail-converting nil)))) (setq quail-translating nil) (if (overlay-start quail-conv-overlay) @@ -2486,7 +2488,6 @@ should be made by `quail-build-decode-map' (which see)." "Show brief description of the current Quail package. Optional arg PACKAGE specifies the name of alternative Quail package to describe." - (interactive) (require 'help-mode) (let ((help-xref-mule-regexp help-xref-mule-regexp-template) (mb enable-multibyte-characters) @@ -2533,33 +2534,37 @@ package to describe." (let ((done-list nil)) ;; Show keyboard layout if the current package requests it.. (when (quail-show-layout) - (insert " + (insert (substitute-command-keys " KEYBOARD LAYOUT --------------- This input method works by translating individual input characters. -Assuming that your actual keyboard has the `") +Assuming that your actual keyboard has the `")) (help-insert-xref-button quail-keyboard-layout-type 'quail-keyboard-layout-button quail-keyboard-layout-type) - (insert "' layout, -translation results in the following \"virtual\" keyboard layout: -") + (insert (substitute-command-keys "' layout, +translation results in the following \"virtual\" keyboard layout +\(the labels on the keys indicate what character will be produced +by each key, with and without holding Shift): +")) (setq done-list (quail-insert-kbd-layout quail-keyboard-layout)) - (insert "If your keyboard has a different layout, rearranged from -`") + (insert (substitute-command-keys "\ +If your keyboard has a different layout, rearranged from +`")) (help-insert-xref-button "standard" 'quail-keyboard-layout-button "standard") - (insert "', the \"virtual\" keyboard you get with this input method + (insert (substitute-command-keys "\ +', the \"virtual\" keyboard you get with this input method will be rearranged in the same way. You can set the variable `quail-keyboard-layout-type' to specify the physical layout of your keyboard; the tables shown in documentation of input methods including this one are based on the physical keyboard layout as specified with that variable. -") +")) (help-insert-xref-button "[customize keyboard layout]" 'quail-keyboard-customize-button 'quail-keyboard-layout-type) @@ -2983,7 +2988,7 @@ of each directory." quail-dirs list-buf pkg-list pos) (if (not (file-writable-p leim-list)) (error "Can't write to file \"%s\"" leim-list)) - (message "Updating %s ..." leim-list) + (or noninteractive (message "Updating %s ..." leim-list)) (setq list-buf (find-file-noselect leim-list)) ;; At first, clean up the file. @@ -3075,7 +3080,7 @@ of each directory." (let ((coding-system-for-write 'utf-8)) (save-buffer 0))) (kill-buffer list-buf) - (message "Updating %s ... done" leim-list))) + (or noninteractive (message "Updating %s ... done" leim-list)))) (defun quail-advice (args) "Advise users about the characters input by the current Quail package. |