Mercurial > emacs
comparison lisp/international/quail.el @ 101983:70db2d7b280c
(quail-make-guidance-frame): Remove the `parent-id' parameter.
(quail-show-guidance): Make the new window dedicated.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Thu, 12 Feb 2009 18:13:20 +0000 |
| parents | 43780da4f5f4 |
| children | 1e6acde5f33a |
comparison
equal
deleted
inserted
replaced
| 101982:f22ae19dd025 | 101983:70db2d7b280c |
|---|---|
| 1925 (internal-border (cdr (assq 'internal-border-width fparam))) | 1925 (internal-border (cdr (assq 'internal-border-width fparam))) |
| 1926 (newtop (- top | 1926 (newtop (- top |
| 1927 (frame-char-height) (* internal-border 2) (* border 2)))) | 1927 (frame-char-height) (* internal-border 2) (* border 2)))) |
| 1928 (if (< newtop 0) | 1928 (if (< newtop 0) |
| 1929 (setq newtop (+ top (frame-pixel-height) internal-border border))) | 1929 (setq newtop (+ top (frame-pixel-height) internal-border border))) |
| 1930 ;; If I leave the `parent-id' parameter, my frame ends up with 13 lines | |
| 1931 ;; rather than just 1. Not sure what is really going on, but | |
| 1932 ;; clearly this parameter is not needed. --Stef | |
| 1933 (setq fparam (delq (assoc 'parent-id fparam) fparam)) | |
| 1930 (make-frame (append '((user-position . t) (height . 1) | 1934 (make-frame (append '((user-position . t) (height . 1) |
| 1931 (minibuffer) | 1935 (minibuffer) |
| 1932 (menu-bar-lines . 0) (tool-bar-lines . 0)) | 1936 (menu-bar-lines . 0) (tool-bar-lines . 0)) |
| 1933 (cons (cons 'top newtop) fparam))))) | 1937 (cons (cons 'top newtop) fparam))))) |
| 1934 | 1938 |
| 1988 (if (eq (minibuffer-window) (frame-root-window)) | 1992 (if (eq (minibuffer-window) (frame-root-window)) |
| 1989 ;; Use another frame. It is sure that we are using some | 1993 ;; Use another frame. It is sure that we are using some |
| 1990 ;; window system. | 1994 ;; window system. |
| 1991 (let ((guidance quail-guidance-str)) | 1995 (let ((guidance quail-guidance-str)) |
| 1992 (or (frame-live-p quail-guidance-frame) | 1996 (or (frame-live-p quail-guidance-frame) |
| 1993 (setq quail-guidance-frame | 1997 (setq quail-guidance-frame |
| 1994 (quail-make-guidance-frame))) | 1998 (quail-make-guidance-frame))) |
| 1995 (or (buffer-live-p quail-guidance-buf) | 1999 (or (buffer-live-p quail-guidance-buf) |
| 1996 (setq quail-guidance-buf | 2000 (setq quail-guidance-buf |
| 1997 (get-buffer-create " *Quail-guidance*"))) | 2001 (get-buffer-create " *Quail-guidance*"))) |
| 1998 (with-current-buffer quail-guidance-buf | 2002 (with-current-buffer quail-guidance-buf |
| 1999 (erase-buffer) | 2003 (erase-buffer) |
| 2000 (setq cursor-type nil) | 2004 (setq cursor-type nil) |
| 2001 (insert guidance)) | 2005 (insert guidance)) |
| 2002 (set-window-buffer (frame-root-window quail-guidance-frame) | 2006 (let ((win (frame-root-window quail-guidance-frame))) |
| 2003 quail-guidance-buf) | 2007 (set-window-buffer win quail-guidance-buf) |
| 2008 (set-window-dedicated-p win t)) | |
| 2004 (quail-minibuffer-message | 2009 (quail-minibuffer-message |
| 2005 (format " [%s]" current-input-method-title))) | 2010 (format " [%s]" current-input-method-title))) |
| 2006 ;; Show the guidance in the next line of the currrent | 2011 ;; Show the guidance in the next line of the currrent |
| 2007 ;; minibuffer. | 2012 ;; minibuffer. |
| 2008 (quail-minibuffer-message | 2013 (quail-minibuffer-message |
| 2009 (format " [%s]\n%s" | 2014 (format " [%s]\n%s" |
| 2010 current-input-method-title quail-guidance-str))) | 2015 current-input-method-title quail-guidance-str))) |
| 2011 ;; Show the guidance in echo area without logging. | 2016 ;; Show the guidance in echo area without logging. |
| 2012 (let ((message-log-max nil)) | 2017 (let ((message-log-max nil)) |
| 2013 (message "%s" quail-guidance-str))))) | 2018 (message "%s" quail-guidance-str))))) |
| 2014 | 2019 |