procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(quail-make-guidance-frame): Remove the `parent-id' parameter.

Browse source 
(quail-show-guidance): Make the new window dedicated.
This commit is contained in:
Stefan Monnier 2009-02-12 18:13:20 +00:00
parent 4eb9723260
commit f58bd666fc
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lisp/ChangeLog
View file

@ -1,3 +1,9 @@
2009-02-12 Stefan Monnier <monnier@iro.umontreal.ca>
* international/quail.el (quail-make-guidance-frame): Remove the
`parent-id' parameter.
(quail-show-guidance): Make the new window dedicated.
2009-02-12 Juanma Barranquero <lekktu@gmail.com>
* international/characters.el (?1, ?2, ?3, ?4, ?7, ?^):

13
lisp/international/quail.el
View file

@ -1927,6 +1927,10 @@ Remaining args are for FUNC."
(frame-char-height) (* internal-border 2) (* border 2))))
(if (< newtop 0)
(setq newtop (+ top (frame-pixel-height) internal-border border)))
;; If I leave the `parent-id' parameter, my frame ends up with 13 lines
;; rather than just 1. Not sure what is really going on, but
;; clearly this parameter is not needed. --Stef
(setq fparam (delq (assoc 'parent-id fparam) fparam))
(make-frame (append '((user-position . t) (height . 1)
(minibuffer)
(menu-bar-lines . 0) (tool-bar-lines . 0))
@ -1990,7 +1994,7 @@ minibuffer and the selected frame has no other windows)."
;; window system.
(let ((guidance quail-guidance-str))
(or (frame-live-p quail-guidance-frame)
(setq quail-guidance-frame
(setq quail-guidance-frame
(quail-make-guidance-frame)))
(or (buffer-live-p quail-guidance-buf)
(setq quail-guidance-buf
@ -1999,14 +2003,15 @@ minibuffer and the selected frame has no other windows)."
(erase-buffer)
(setq cursor-type nil)
(insert guidance))
(set-window-buffer (frame-root-window quail-guidance-frame)
quail-guidance-buf)
(let ((win (frame-root-window quail-guidance-frame)))
(set-window-buffer win quail-guidance-buf)
(set-window-dedicated-p win t))
(quail-minibuffer-message
(format " [%s]" current-input-method-title)))
;; Show the guidance in the next line of the currrent
;; minibuffer.
(quail-minibuffer-message
(format " [%s]\n%s"
(format " [%s]\n%s"
current-input-method-title quail-guidance-str)))
;; Show the guidance in echo area without logging.
(let ((message-log-max nil))