diff options
Diffstat (limited to 'lisp/international')
| -rw-r--r-- | lisp/international/code-pages.el | 2 | ||||
| -rw-r--r-- | lisp/international/codepage.el | 2 | ||||
| -rw-r--r-- | lisp/international/mule-cmds.el | 12 | ||||
| -rw-r--r-- | lisp/international/mule-diag.el | 6 | ||||
| -rw-r--r-- | lisp/international/mule.el | 12 | ||||
| -rw-r--r-- | lisp/international/quail.el | 2 |
6 files changed, 18 insertions, 18 deletions
diff --git a/lisp/international/code-pages.el b/lisp/international/code-pages.el index df9853147c2..a3f5ff4819f 100644 --- a/lisp/international/code-pages.el +++ b/lisp/international/code-pages.el @@ -130,7 +130,7 @@ read/written by MS-DOS software, or for display on the MS-DOS terminal." (interactive (let ((completion-ignore-case t) (candidates (cp-supported-codepages))) - (list (completing-read "Setup DOS Codepage: (default 437) " candidates + (list (completing-read "Setup DOS Codepage (default 437): " candidates nil t nil nil "437")))) (let ((cp (format "cp%s" codepage))) (unless (coding-system-p (intern cp)) diff --git a/lisp/international/codepage.el b/lisp/international/codepage.el index 854d4673ecd..56920b968ac 100644 --- a/lisp/international/codepage.el +++ b/lisp/international/codepage.el @@ -662,7 +662,7 @@ read/written by MS-DOS software, or for display on the MS-DOS terminal." (interactive (let ((completion-ignore-case t) (candidates (cp-supported-codepages))) - (list (completing-read "Setup DOS Codepage: (default 437) " candidates + (list (completing-read "Setup DOS Codepage (default 437): " candidates nil t nil nil "437")))) (let* ((cp (format "cp%s" codepage)) (cp-defined (intern-soft cp))) diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el index 8f491560ecc..f1c7a65a5a5 100644 --- a/lisp/international/mule-cmds.el +++ b/lisp/international/mule-cmds.el @@ -278,7 +278,7 @@ wrong, use this command again to toggle back to the right mode." buffer-file-coding-system))) (list (read-coding-system (if default - (format "Coding system for following command (default, %s): " default) + (format "Coding system for following command (default %s): " default) "Coding system for following command: ") default)))) (let* ((keyseq (read-key-sequence @@ -616,7 +616,7 @@ or nil if all characters are encodable." (interactive (list (let ((default (or buffer-file-coding-system 'us-ascii))) (read-coding-system - (format "Coding-system (default, %s): " default) + (format "Coding-system (default %s): " default) default)))) (let ((pos (unencodable-char-position (point) (point-max) coding-system))) (if pos @@ -1490,7 +1490,7 @@ which marks the variable `default-input-method' as set for Custom buffers." "Describe input method INPUT-METHOD." (interactive (list (read-input-method-name - "Describe input method (default, current choice): "))) + "Describe input method (default current choice): "))) (if (and input-method (symbolp input-method)) (setq input-method (symbol-name input-method))) (help-setup-xref (list #'describe-input-method @@ -1810,7 +1810,7 @@ which is the name of a language environment. For example, \"Latin-1\" specifies the character set for the major languages of Western Europe." (interactive (list (read-language-name nil - "Set language environment (default, English): "))) + "Set language environment (default English): "))) (if language-name (if (symbolp language-name) (setq language-name (symbol-name language-name))) @@ -1986,7 +1986,7 @@ of `buffer-file-coding-system' set by this function." (interactive (list (read-language-name 'documentation - "Describe language environment (default, current choice): "))) + "Describe language environment (default current choice): "))) (if (null language-name) (setq language-name current-language-environment)) (if (or (null language-name) @@ -2014,7 +2014,7 @@ of `buffer-file-coding-system' set by this function." (l (copy-sequence input-method-alist))) (insert "Input methods") (when input-method - (insert " (default, " input-method ")") + (insert " (default " input-method ")") (setq input-method (assoc input-method input-method-alist)) (setq l (cons input-method (delete input-method l)))) (insert ":\n") diff --git a/lisp/international/mule-diag.el b/lisp/international/mule-diag.el index 6e2ff809cac..0a2e5a7c325 100644 --- a/lisp/international/mule-diag.el +++ b/lisp/international/mule-diag.el @@ -598,7 +598,7 @@ PC `codepages' and other coded character sets. See `non-iso-charset-alist'." ;;;###autoload (defun describe-coding-system (coding-system) "Display information about CODING-SYSTEM." - (interactive "zDescribe coding system (default, current choices): ") + (interactive "zDescribe coding system (default current choices): ") (if (null coding-system) (describe-current-coding-system) (help-setup-xref (list #'describe-coding-system coding-system) @@ -1040,7 +1040,7 @@ but still contains full information about each coding system." ;;;###autoload (defun describe-font (fontname) "Display information about fonts which partially match FONTNAME." - (interactive "sFontname (default, current choice for ASCII chars): ") + (interactive "sFontname (default current choice for ASCII chars): ") (or (and window-system (fboundp 'fontset-list)) (error "No fontsets being used")) (when (or (not fontname) (= (length fontname) 0)) @@ -1137,7 +1137,7 @@ This shows which font is used for which character(s)." (mapcar 'cdr fontset-alias-alist))) (completion-ignore-case t)) (list (completing-read - "Fontset (default, used by the current frame): " + "Fontset (default used by the current frame): " fontset-list nil t))))) (if (= (length fontset) 0) (setq fontset (frame-parameter nil 'font))) diff --git a/lisp/international/mule.el b/lisp/international/mule.el index 80c4fd590fe..a4a1ca76e2c 100644 --- a/lisp/international/mule.el +++ b/lisp/international/mule.el @@ -1159,7 +1159,7 @@ surely saves the buffer with CODING-SYSTEM. From a program, if you don't want to mark the buffer modified, specify t for NOMODIFY. If you know exactly what coding system you want to use, just set the variable `buffer-file-coding-system' directly." - (interactive "zCoding system for saving file (default, nil): \nP") + (interactive "zCoding system for saving file (default nil): \nP") (check-coding-system coding-system) (if (and coding-system buffer-file-coding-system (null force)) (setq coding-system @@ -1183,7 +1183,7 @@ do. If FORCE is nil, get the unspecified aspect (or aspects) from the buffer's previous `buffer-file-coding-system' value (if it is specified there). Otherwise, determine it from the file contents as usual for visiting a file." - (interactive "zCoding system for visited file (default, nil): \nP") + (interactive "zCoding system for visited file (default nil): \nP") (check-coding-system coding-system) (if (and coding-system buffer-file-coding-system (null force)) (setq coding-system @@ -1195,7 +1195,7 @@ usual for visiting a file." "Set coding system for decoding and encoding file names to CODING-SYSTEM. It actually just set the variable `file-name-coding-system' (which see) to CODING-SYSTEM." - (interactive "zCoding system for file names (default, nil): ") + (interactive "zCoding system for file names (default nil): ") (check-coding-system coding-system) (if (and coding-system (coding-system-get coding-system 'ascii-incompatible)) @@ -1219,7 +1219,7 @@ or by the previous use of this command." default-terminal-coding-system) default-terminal-coding-system))) (read-coding-system - (format "Coding system for terminal display (default, %s): " + (format "Coding system for terminal display (default %s): " default) default)))) (if (and (not coding-system) @@ -1248,7 +1248,7 @@ or by the previous use of this command." default-keyboard-coding-system) default-keyboard-coding-system))) (read-coding-system - (format "Coding system for keyboard input (default, %s): " + (format "Coding system for keyboard input (default %s): " default) default)))) (if (and (not coding-system) @@ -1321,7 +1321,7 @@ This setting is effective for the next communication only." (interactive (list (read-coding-system (if last-next-selection-coding-system - (format "Coding system for the next X selection (default, %S): " + (format "Coding system for the next X selection (default %S): " last-next-selection-coding-system) "Coding system for the next X selection: ") last-next-selection-coding-system))) diff --git a/lisp/international/quail.el b/lisp/international/quail.el index 1bc02863ffb..0f9cc8f231d 100644 --- a/lisp/international/quail.el +++ b/lisp/international/quail.el @@ -897,7 +897,7 @@ The format of KBD-LAYOUT is the same as `quail-keyboard-layout'." The variable `quail-keyboard-layout-type' holds the currently selected keyboard type." (interactive - (list (completing-read "Keyboard type (default, current choice): " + (list (completing-read "Keyboard type (default current choice): " quail-keyboard-layout-alist nil t))) (or (and keyboard-type (> (length keyboard-type) 0)) |