From: Kenichi Handa Date: Fri, 8 Dec 2000 00:06:01 +0000 (+0000) Subject: (quail-insert-decode-map): Check the X-Git-Tag: emacs-pretest-21.0.93~92 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=58d2b9863b1ef9bc95be089ca8def335fd4c481e;p=emacs.git (quail-insert-decode-map): Check the frame width of a window displaying the current buffer, not that of the selected frame. (quail-help): Make sure that the help buffer has window before inserting text in it. --- diff --git a/lisp/international/quail.el b/lisp/international/quail.el index 805cf203bbb..02ebd110a8e 100644 --- a/lisp/international/quail.el +++ b/lisp/international/quail.el @@ -2306,7 +2306,8 @@ are shown (at most to the depth specified `quail-completion-max-depth')." (or (> (length x) (length y)) (and (= (length x) (length y)) (not (string< x y)))))))) - (let ((frame-width (frame-width)) + (let ((frame-width (frame-width (window-frame (get-buffer-window + (current-buffer) 'visible)))) (single-key-width 3) (single-trans-width 4) (multiple-key-width 3) @@ -2399,10 +2400,17 @@ package to describe." (setq package (assoc package quail-package-alist)) (setq package quail-current-package)) (let ((help-xref-mule-regexp help-xref-mule-regexp-template)) + ;; At first, make sure that the help buffer has window. (with-output-to-temp-buffer "*Help*" (save-excursion (set-buffer standard-output) - (setq quail-current-package package) + (setq quail-current-package package))) + ;; Then, insert text in the help buffer while paying attention to + ;; the width of the frame in which the buffer displayed. + (save-excursion + (progn + (set-buffer (get-buffer "*Help*")) + (setq buffer-read-only nil) (insert "Input method: " (quail-name) " (mode line indicator:" (quail-title)