Mercurial > hg > xemacs-beta
view lisp/resize-minibuffer.el @ 4995:8431b52e43b1
Move the various map* functions to C; add #'map-into.
src/ChangeLog addition:
2010-01-31 Aidan Kehoe <kehoea@parhasard.net>
Move #'mapcar*, #'mapcan, #'mapc, #'map, #'mapl, #'mapcon to C;
extend #'mapvector, #'mapconcat, #'mapcar to support more
SEQUENCES; have them all error with circular lists.
* fns.c (Fsubseq): Call CHECK_SEQUENCE here; Flength can return
from the debugger if it errors with a non-sequence, leading to a
crash in Fsubseq if sequence really is *not* a sequence.
(mapcarX): Rename mapcar1 to mapcarX; rework it comprehensively to
take an optional lisp output argument, and a varying number of
sequences.
Special-case a single list argument, as we used to, saving its
elements in the stack space for the results before calling
FUNCTION, so FUNCTION can corrupt the list all it
wants. dead_wrong_type_argument() in the other cases if we
encounter a non-cons where we expected a cons.
(Fmapconcat):
Accept further SEQUENCES after separator here. Special-case
the idiom (mapconcat 'identity SEQUENCE), don't even funcall.
(FmapcarX): Rename this from Fmapcar. Accept optional SEQUENCES.
(Fmapvector): Accept optional SEQUENCES.
(Fmapcan, Fmapc, Fmap): Move these here from cl-extra.el.
(Fmap_into): New function, as specified by Common Lisp.
(maplist): New function, the guts of the implementation of
Fmaplist and Fmapl.
(Fmaplist, Fmapl, Fmapcon): Move these from cl-extra.el.
(syms_of_fns):
Add a few needed symbols here, for the type tests
used by #'map. Add the new subrs, with aliases for #'mapc-internal
and #'mapcar.
* general-slots.h: Declare Qcoerce here, now it's used in both
indent.c and fns.c
* indent.c (syms_of_indent): Qcoerce is gone from here.
* lisp.h: Add ARRAYP(), SEQUENCEP(), and the corresponding CHECK_*
macros. Declare Fbit_vector, Fstring, FmapcarX, now other files
need to use them.
* data.c (Farrayp, Fsequencep): Use ARRAYP and SEQUENCEP, just
added to lisp.h
* buffer.c (Fbuffer_list): Now Fmapcar has been renamed FmapcarX
and takes MANY arguments, update this function to reflect that.
lisp/ChangeLog addition:
2010-01-31 Aidan Kehoe <kehoea@parhasard.net>
* cl.el (mapcar*): Delete; this is now in fns.c.
Use #'mapc, not #'mapc-internal in a couple of places.
* cl-macs.el (mapc, mapcar*, map): Delete these compiler macros
now the corresponding functions are in fns.c; there's no run-time
advantage to the macros.
* cl-extra.el (coerce): Extend the possible conversions here a
little; it's not remotely comprehensive yet, though it does allow
running slightly more Common Lisp code than previously.
(cl-mapcar-many): Delete.
(map, maplist, mapc, mapl, mapcan, mapcon): Move these to fns.c.
* bytecomp.el (byte-compile-maybe-mapc):
Use #'mapc itself, not #'mapc-internal, now the former is in C.
(mapcar*): Use #'byte-compile-maybe-mapc as this function's
byte-compile method, now a #'mapc that can take more than one
sequence is in C.
* obsolete.el (cl-mapc): Move this compatibility alias to this file.
* update-elc.el (do-autoload-commands): Use #'mapc, not
#'mapc-internal here.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sun, 31 Jan 2010 18:29:48 +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