Mercurial > hg > xemacs-beta
view lisp/resize-minibuffer.el @ 4604:e0a8715fdb1f
Support new IGNORE-INVALID-SEQUENCESP argument, #'query-coding-region.
lisp/ChangeLog addition:
2009-02-07 Aidan Kehoe <kehoea@parhasard.net>
* coding.el (query-coding-clear-highlights):
Rename the BUFFER argument to BUFFER-OR-STRING, describe it as
possibly being a string in its documentation.
(default-query-coding-region):
Add a new IGNORE-INVALID-SEQUENCESP argument, document that this
function does not support it.
Bind case-fold-search to nil, we don't want this to influence what the
function thinks is encodable or not.
(query-coding-region):
Add a new IGNORE-INVALID-SEQUENCESP argument, document what it
does; reflect this new argument in the associated compiler macro.
(query-coding-string):
Add a new IGNORE-INVALID-SEQUENCESP argument, document what it
does. Support the HIGHLIGHT argument correctly.
* unicode.el (unicode-query-coding-region):
Add a new IGNORE-INVALID-SEQUENCESP argument, document what it
does, implement this. Document a potential problem.
Use #'query-coding-clear-highlights instead of reimplementing it
ourselves.
Remove some debugging messages.
* mule/arabic.el (iso-8859-6):
* mule/cyrillic.el (iso-8859-5):
* mule/greek.el (iso-8859-7):
* mule/hebrew.el (iso-8859-8):
* mule/latin.el (iso-8859-2):
* mule/latin.el (iso-8859-3):
* mule/latin.el (iso-8859-4):
* mule/latin.el (iso-8859-14):
* mule/latin.el (iso-8859-15):
* mule/latin.el (iso-8859-16):
* mule/latin.el (iso-8859-9):
* mule/latin.el (windows-1252):
* mule/mule-coding.el (iso-8859-1):
Avoid the assumption that characters not given an explicit mapping
in these coding systems map to the ISO 8859-1 characters
corresponding to the octets on disk; this makes it much more
reasonable to implement the IGNORE-INVALID-SEQUENCESP argument to
query-coding-region.
* mule/mule-cmds.el (set-language-info):
Correct the docstring.
* mule/mule-cmds.el (finish-set-language-environment):
Treat invalid Unicode sequences produced from
invalid-sequence-coding-system and corresponding to control
characters the same as control characters in redisplay.
* mule/mule-cmds.el:
Document that encode-coding-char is available in coding.el
* mule/mule-coding.el (make-8-bit-generate-helper):
Change to return the both the encode-program generated and the
relevant non-ASCII charset; update the docstring to reflect this.
* mule/mule-coding.el
(make-8-bit-generate-encode-program-and-skip-chars-strings):
Rename this function; have it return skip-chars-strings as well as
the encode program. Have these skip-chars-strings use ranges for
charsets, where possible.
* mule/mule-coding.el (make-8-bit-create-decode-encode-tables):
Revise this to allow people to specify explicitly characters that
should be undefined (= corresponding to keys in
unicode-error-default-translation-table), and treating unspecified
octets above #x7f as undefined by default.
* mule/mule-coding.el (8-bit-fixed-query-coding-region):
Add a new IGNORE-INVALID-SEQUENCESP argument, implement support
for it using the 8-bit-fixed-invalid-sequences-skip-chars coding
system property; remove some debugging messages.
* mule/mule-coding.el (make-8-bit-coding-system):
This function is dumped, autoloading it makes no sense.
Document what happens when characters above #x7f are not
specified, implement this.
* mule/vietnamese.el:
Correct spelling.
tests/ChangeLog addition:
2009-02-07 Aidan Kehoe <kehoea@parhasard.net>
* automated/query-coding-tests.el:
Add FAILING-CASE arguments to the Assert calls, making #'q-c-debug
mostly unnecessary. Remove #'q-c-debug.
Add new tests that use the IGNORE-INVALID-SEQUENCESP argument to
#'query-coding-region; rework the existing ones to respect it.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Sat, 07 Feb 2009 17:13:37 +0000 |
| parents | 5db7720dd944 |
| children | 91b3aa59f49b |
line wrap: on
line source
;;; resize-minibuffer.el --- dynamically resize minibuffer to display entire contents ;; Copyright (C) 1990 Roland McGrath ;; Copyright (C) 1993, 1994 Noah S. Friedman ;; Author: Noah Friedman <friedman@prep.ai.mit.edu> ;; Author: Roland McGrath <roland@prep.ai.mit.edu> ;; Modified for Lucid Emacs By: Peter Stout <pds@cs.cmu.edu> ;; Maintainer: friedman@prep.ai.mit.edu ;; Keywords: minibuffer, window, frames, display ;; This file is part of XEmacs. ;; XEmacs is free software; you can redistribute it and/or modify it ;; under the terms of the GNU General Public License as published by ;; the Free Software Foundation; either version 2, or (at your option) ;; any later version. ;; XEmacs is distributed in the hope that it will be useful, but ;; WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ;; General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with XEmacs; see the file COPYING. If not, you can either ;; send email to this program's maintainer or write to: The Free ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ;; 02111-1307, USA. ;;; Synched up with: Not synched. Copied from rsz-minibuf.el to ;;; resize-minibuffer.el to avoid current problems where, when there's a ;;; file in dump and a file with the same name in packages, a dumping ;;; XEmacs will find the wrong one! ;;; Commentary: ;; This file has received maintenance by the XEmacs development team. ;; This package allows the entire contents (or as much as possible) of the ;; minibuffer to be visible at once when typing. As the end of a line is ;; reached, the minibuffer will resize itself. When the user is done ;; typing, the minibuffer will return to its original size. ;; In window systems where it is possible to have a frame in which the ;; minibuffer is the only window, the frame itself can be resized. In FSF ;; GNU Emacs 19.22 and earlier, the frame may not be properly returned to ;; its original size after it ceases to be active because ;; `minibuffer-exit-hook' didn't exist until version 19.23. ;; NOTE: The code to resize frames has not been tested under Lucid Emacs, ;; because detached minibuffers are broken. ;; Note that the minibuffer and echo area are not the same! They simply ;; happen to occupy roughly the same place on the frame. Messages put in ;; the echo area will not cause any resizing by this package. ;; This package is considered a minor mode but it doesn't put anything in ;; minor-mode-alist because this mode is specific to the minibuffer, which ;; has no modeline. ;; To use this package, put the following in your .emacs: ;; ;; (autoload 'resize-minibuffer-mode "rsz-minibuf" nil t) ;; ;; Invoking the command `resize-minibuffer-mode' will then enable this mode. ;;; Code: (defgroup resize-minibuffer nil "Dynamically resize minibuffer to display entire contents" :group 'frames) (defcustom resize-minibuffer-mode nil "*If non-`nil', resize the minibuffer so its entire contents are visible." :type 'boolean :require 'rsz-minibuf :group 'resize-minibuffer) (defcustom resize-minibuffer-window-max-height nil "*Maximum size the minibuffer window is allowed to become. If less than 1 or not a number, the limit is the height of the frame in which the active minibuffer window resides." :type '(choice (const nil) integer) :group 'resize-minibuffer) ;; #### Yeah, I know. The relation between the echo area and the ;; minibuffer needs rethinking. It's not really possible to unify them at ;; present. -- sjt (defcustom resize-minibuffer-idle-height nil "When minibuffer is idle, crop its window to this height. Must be a positive integer or nil. nil indicates no limit. Effective only when `undisplay-echo-area-function' respects it. One such function is `undisplay-echo-area-resize-window'.") (defcustom resize-minibuffer-window-exactly t "*If non-`nil', make minibuffer exactly the size needed to display all its contents. Otherwise, the minibuffer window can temporarily increase in size but never get smaller while it is active." :type 'boolean :group 'resize-minibuffer) (defcustom resize-minibuffer-frame nil "*If non-`nil' and the active minibuffer is the sole window in its frame, allow changing the frame height." :type 'boolean :group 'resize-minibuffer) (defcustom resize-minibuffer-frame-max-height nil "*Maximum size the minibuffer frame is allowed to become. If less than 1 or not a number, there is no limit.") (defcustom resize-minibuffer-frame-exactly nil "*If non-`nil', make minibuffer frame exactly the size needed to display all its contents. Otherwise, the minibuffer frame can temporarily increase in size but never get smaller while it is active." :type 'boolean :group 'resize-minibuffer) (defun resize-minibuffer-mode (&optional prefix) "Enable or disable resize-minibuffer mode. A negative prefix argument disables this mode. A positive argument or argument of 0 enables it. When this minor mode is enabled, the minibuffer is dynamically resized to contain the entire region of text put in it as you type. The variable `resize-minibuffer-mode' is set to t or nil depending on whether this mode is active or not. The maximum height to which the minibuffer can grow is controlled by the variable `resize-minibuffer-window-max-height'. The variable `resize-minibuffer-window-exactly' determines whether the minibuffer window should ever be shrunk to make it no larger than needed to display its contents. When using a window system, it is possible for a minibuffer to be the sole window in a frame. Since that window is already its maximum size, the only way to make more text visible at once is to increase the size of the frame. The variable `resize-minibuffer-frame' controls whether this should be done. The variables `resize-minibuffer-frame-max-height' and `resize-minibuffer-frame-exactly' are analogous to their window counterparts." (interactive "p") (or prefix (setq prefix 0)) (cond ((>= prefix 0) (setq resize-minibuffer-mode t)) (t (setq resize-minibuffer-mode nil)))) (defun resize-minibuffer-setup () (cond (resize-minibuffer-mode (cond ((and (not (eq 'tty (console-type))) (eq 'only (plist-get (frame-properties) 'minibuffer))) (and resize-minibuffer-frame (progn (make-local-hook 'minibuffer-exit-hook) (add-hook 'minibuffer-exit-hook 'resize-minibuffer-frame-restore nil t) (make-local-hook 'post-command-hook) (add-hook 'post-command-hook 'resize-minibuffer-frame nil t) (unless (and-boundp 'icomplete-mode icomplete-mode) (resize-minibuffer-frame))))) (t (make-local-hook 'post-command-hook) (add-hook 'post-command-hook 'resize-minibuffer-window nil t) (unless (and-boundp 'icomplete-mode icomplete-mode) (resize-minibuffer-window))))))) (defun resize-minibuffer-count-window-lines (&optional start end) "Return number of window lines occupied by text in region. The number of window lines may be greater than the number of actual lines in the buffer if any wrap on the display due to their length. Optional arguments START and END default to point-min and point-max, respectively." (or start (setq start (point-min))) (or end (setq end (point-max))) (if (= start end) 0 (save-excursion (save-restriction (widen) (narrow-to-region start end) (goto-char start) (vertical-motion (buffer-size)))))) ;; Resize the minibuffer window to contain the minibuffer's contents. ;; The minibuffer must be the current window. (defun resize-minibuffer-window () (let ((height (window-height)) (lines (1+ (resize-minibuffer-count-window-lines)))) (and (numberp resize-minibuffer-window-max-height) (> resize-minibuffer-window-max-height 0) (setq lines (min lines resize-minibuffer-window-max-height))) (or (if resize-minibuffer-window-exactly (= lines height) (<= lines height)) (enlarge-window (- lines height))))) ;; Resize the minibuffer frame to contain the minibuffer's contents. ;; The minibuffer frame must be the current frame. (defun resize-minibuffer-frame () (let ((height (frame-height)) (lines (1+ (resize-minibuffer-count-window-lines)))) (and (numberp resize-minibuffer-frame-max-height) (> resize-minibuffer-frame-max-height 0) (setq lines (min lines resize-minibuffer-frame-max-height))) (cond ((> lines height) (set-frame-size (selected-frame) (frame-width) lines)) ((and resize-minibuffer-frame-exactly (> height (plist-get minibuffer-frame-plist 'height)) (< lines height)) (set-frame-size (selected-frame) (frame-width) lines))))) ;; Restore the original height of the frame. (defun resize-minibuffer-frame-restore () (set-frame-size (selected-frame) (frame-width) (plist-get minibuffer-frame-plist 'height))) (provide 'rsz-minibuf) (add-hook 'minibuffer-setup-hook 'resize-minibuffer-setup) ;;; rsz-minibuf.el ends here
