From: Paul Eggert Date: Mon, 31 Aug 2015 06:10:51 +0000 (-0700) Subject: Quoting fixes in lisp/international and lisp/leim X-Git-Tag: emacs-25.0.90~1230^2~22 X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/9ffb6ce9a7b5692f8470ea227e677a16a6654f66 Quoting fixes in lisp/international and lisp/leim * lisp/international/ccl.el (ccl-dump, ccl-dump-call): * lisp/international/ja-dic-utl.el (skkdic-lookup-key): * lisp/international/mule-cmds.el: (select-safe-coding-system-interactively, leim-list-file-name): * lisp/international/quail.el (quail-use-package, quail-help): * lisp/international/titdic-cnv.el (tit-process-header) (miscdic-convert): Respect text quoting style in doc strings and diagnostics. * lisp/international/quail.el (lisp/international/quail.el): * lisp/leim/quail/ethiopic.el ("ethiopic"): Escape apostrophes in doc strings. --- diff --git a/lisp/international/ccl.el b/lisp/international/ccl.el index 429c14b5e4..b9cc163391 100644 --- a/lisp/international/ccl.el +++ b/lisp/international/ccl.el @@ -967,7 +967,7 @@ is a list of CCL-BLOCKs." (let ((len (length ccl-code)) (buffer-mag (aref ccl-code 0))) (cond ((= buffer-mag 0) - (insert "Don't output anything.\n")) + (insert "Don’t output anything.\n")) ((= buffer-mag 1) (insert "Out-buffer must be as large as in-buffer.\n")) (t @@ -1127,7 +1127,7 @@ is a list of CCL-BLOCKs." (defun ccl-dump-call (ignore cc) (let ((subroutine (car (ccl-get-next-code)))) - (insert (format "call subroutine `%s'\n" subroutine)))) + (insert (format-message "call subroutine `%s'\n" subroutine)))) (defun ccl-dump-write-const-string (rrr cc) (if (= rrr 0) diff --git a/lisp/international/ja-dic-utl.el b/lisp/international/ja-dic-utl.el index 8400c473af..7005ba8572 100644 --- a/lisp/international/ja-dic-utl.el +++ b/lisp/international/ja-dic-utl.el @@ -109,13 +109,14 @@ without okurigana are placed at the head of the returned list." (load-library "ja-dic/ja-dic") (error (ding) (with-output-to-temp-buffer "*Help*" - (princ "The library `ja-dic' can't be loaded. + (princ (substitute-command-keys "\ +The library `ja-dic' can't be loaded. The most common case is that you have not yet installed the library included 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."))) (signal (car err) (cdr err))))) (let ((vec (make-vector len 0)) diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el index 4ee3b2831e..5934919d42 100644 --- a/lisp/international/mule-cmds.el +++ b/lisp/international/mule-cmds.el @@ -744,7 +744,8 @@ e.g., for sending an email message.\n ") (when unsafe (insert (if rejected "The other coding systems" "However, each of them") - " encountered characters it couldn't encode:\n") + (substitute-command-keys + " encountered characters it couldn't encode:\n")) (dolist (coding unsafe) (insert (format " %s cannot encode these:" (car coding))) (let ((i 0) @@ -1285,9 +1286,9 @@ Emacs loads this file at startup time.") ;; INPUT-METHOD LANGUAGE-NAME ACTIVATE-FUNC ;; TITLE DESCRIPTION ;; ARG ...) -;; See the function `register-input-method' for the meanings of the arguments. +;; See the function ‘register-input-method’ for the meanings of the arguments. ;; -;; If this directory is included in `load-path', Emacs automatically +;; If this directory is included in ‘load-path’, Emacs automatically ;; loads this file at startup time. " diff --git a/lisp/international/quail.el b/lisp/international/quail.el index 8c9d145763..01676ac4fb 100644 --- a/lisp/international/quail.el +++ b/lisp/international/quail.el @@ -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) @@ -625,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) @@ -2533,35 +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, + (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) diff --git a/lisp/international/titdic-cnv.el b/lisp/international/titdic-cnv.el index 1186c7106c..6a15bc41e5 100644 --- a/lisp/international/titdic-cnv.el +++ b/lisp/international/titdic-cnv.el @@ -273,7 +273,8 @@ SPC, 6, 3, 4, or 7 specifying a tone (SPC:$(0?v(N(B, 6:$(0Dm(N(B, 3:$(0&9Vy (princ ";; Quail package `") (princ package) (princ "\n") - (princ ";; Generated by the command `titdic-convert'\n") + (princ (substitute-command-keys + ";; Generated by the command `titdic-convert'\n")) (princ ";;\tOriginal TIT dictionary file: ") (princ (file-name-nondirectory filename)) (princ "\n\n") @@ -1150,8 +1151,9 @@ the generated Quail package is saved." (setq coding-system-for-write (coding-system-change-eol-conversion coding 'unix)) (with-temp-file (expand-file-name quailfile dirname) - (insert (format ";; Quail package `%s'\n" name)) - (insert ";; Generated by the command `miscdic-convert'\n") + (insert (format-message ";; Quail package `%s'\n" name)) + (insert (format-message + ";; Generated by the command `miscdic-convert'\n")) (insert ";; Source dictionary file: " dicfile "\n") (insert ";; Copyright notice of the source file\n") (insert ";;------------------------------------------------------\n") diff --git a/lisp/leim/quail/ethiopic.el b/lisp/leim/quail/ethiopic.el index 7a1cddfff2..eaf3a03baf 100644 --- a/lisp/leim/quail/ethiopic.el +++ b/lisp/leim/quail/ethiopic.el @@ -60,7 +60,7 @@ S-SPC or `M-x ethio-insert-ethio-space' Always insert an Ethiopic word separator `፡'. With a prefix number, insert that many word separators. -C-' or `M-x ethio-gemination' +C-\\=' or `M-x ethio-gemination' Compose the character before the point with the Ethiopic gemination mark. If the character is already composed, decompose it and remove the gemination mark."