diff options
Diffstat (limited to 'lisp/international/quail.el')
-rw-r--r-- | lisp/international/quail.el | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/lisp/international/quail.el b/lisp/international/quail.el index 60c8884be38..1415648be3b 100644 --- a/lisp/international/quail.el +++ b/lisp/international/quail.el @@ -2097,7 +2097,7 @@ are shown (at most to the depth specified `quail-completion-max-depth')." (scroll-other-window))) (setq quail-current-key key) (erase-buffer) - (insert "Possible completion and corresponding translations are:\n") + (insert "Possible completion and corresponding characters are:\n") (quail-completion-1 key map 1) (goto-char (point-min)) (display-buffer (current-buffer)) @@ -2277,8 +2277,8 @@ should be made by `quail-build-decode-map' (which see)." (or (> (length x) (length y)) (and (= (length x) (length y)) (not (string< x y)))))))) - (let ((frame-width (frame-width (window-frame (get-buffer-window - (current-buffer) 'visible)))) + (let ((window-width (window-width (get-buffer-window + (current-buffer) 'visible))) (single-key-width 3) (single-trans-width 4) (multiple-key-width 3) @@ -2307,7 +2307,7 @@ should be made by `quail-build-decode-map' (which see)." (setq multiple-key-width width))) (when single-list (setq col-width (+ single-key-width 1 single-trans-width 1) - cols (/ frame-width col-width) + cols (/ window-width col-width) rows (/ (length single-list) cols)) (if (> (% (length single-list) cols) 0) (setq rows (1+ rows))) @@ -2353,7 +2353,7 @@ should be made by `quail-build-decode-map' (which see)." (lambda (x) (let ((width (if (integerp x) (char-width x) (string-width x)))) - (when (> (+ (current-column) 1 width) frame-width) + (when (> (+ (current-column) 1 width) window-width) (insert "\n") (indent-to multiple-key-width)) (insert " " x)))) @@ -2390,7 +2390,7 @@ package to describe." (with-current-buffer standard-output (setq quail-current-package package-def)))) ;; Then, insert text in the help buffer while paying attention to - ;; the width of the frame in which the buffer displayed. + ;; the width of the window in which the buffer displayed. (with-current-buffer (help-buffer) (setq buffer-read-only nil) (insert "Input method: " (quail-name) @@ -2808,4 +2808,5 @@ call it with one argument STRING." ;; (provide 'quail) +;;; arch-tag: 46d7db54-5467-42c4-a2a9-53ca90a1e886 ;;; quail.el ends here |