Mercurial > hg > xemacs-beta
view lisp/resize-minibuffer.el @ 4885:6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
lisp/ChangeLog addition:
2010-01-24 Aidan Kehoe <kehoea@parhasard.net>
Correct the semantics of #'member*, #'eql, #'assoc* in the
presence of bignums; change the integerp byte code to fixnump
semantics.
* bytecomp.el (fixnump, integerp, byte-compile-integerp):
Change the integerp byte code to fixnump; add a byte-compile
method to integerp using fixnump and numberp and avoiding a
funcall most of the time, since in the non-core contexts where
integerp is used, it's mostly distinguishing between fixnums and
things that are not numbers at all.
* byte-optimize.el (side-effect-free-fns, byte-after-unbind-ops)
(byte-compile-side-effect-and-error-free-ops):
Replace the integerp bytecode with fixnump; add fixnump to the
side-effect-free-fns. Add the other extended number type
predicates to the list in passing.
* obsolete.el (floatp-safe): Mark this as obsolete.
* cl.el (eql): Go into more detail in the docstring here. Don't
bother checking whether both arguments are numbers; one is enough,
#'equal will fail correctly if they have distinct types.
(subst): Replace a call to #'integerp (deciding whether to use
#'memq or not) with one to #'fixnump.
Delete most-positive-fixnum, most-negative-fixnum from this file;
they're now always in C, so they can't be modified from Lisp.
* cl-seq.el (member*, assoc*, rassoc*):
Correct these functions in the presence of bignums.
* cl-macs.el (cl-make-type-test): The type test for a fixnum is
now fixnump. Ditch floatp-safe, use floatp instead.
(eql): Correct this compiler macro in the presence of bignums.
(assoc*): Correct this compiler macro in the presence of bignums.
* simple.el (undo):
Change #'integerp to #'fixnump here, since we use #'delq with the
same value as ELT a few lines down.
src/ChangeLog addition:
2010-01-24 Aidan Kehoe <kehoea@parhasard.net>
Fix problems with #'eql, extended number types, and the hash table
implementation; change the Bintegerp bytecode to fixnump semantics
even on bignum builds, since #'integerp can have a fast
implementation in terms of #'fixnump for most of its extant uses,
but not vice-versa.
* lisp.h: Always #include number.h; we want the macros provided in
it, even if the various number types are not available.
* number.h (NON_FIXNUM_NUMBER_P): New macro, giving 1 when its
argument is of non-immediate number type. Equivalent to FLOATP if
WITH_NUMBER_TYPES is not defined.
* elhash.c (lisp_object_eql_equal, lisp_object_eql_hash):
Use NON_FIXNUM_NUMBER_P in these functions, instead of FLOATP,
giving more correct behaviour in the presence of the extended
number types.
* bytecode.c (Bfixnump, execute_optimized_program):
Rename Bintegerp to Bfixnump; change its semantics to reflect the
new name on builds with bignum support.
* data.c (Ffixnump, Fintegerp, syms_of_data, vars_of_data):
Always make #'fixnump available, even on non-BIGNUM builds;
always implement #'integerp in this file, even on BIGNUM builds.
Move most-positive-fixnum, most-negative-fixnum here from
number.c, so they are Lisp constants even on builds without number
types, and attempts to change or bind them error.
Use the NUMBERP and INTEGERP macros even on builds without
extended number types.
* data.c (fixnum_char_or_marker_to_int):
Rename this function from integer_char_or_marker_to_int, to better
reflect the arguments it accepts.
* number.c (Fevenp, Foddp, syms_of_number):
Never provide #'integerp in this file. Remove #'oddp,
#'evenp; their implementations are overridden by those in cl.el.
* number.c (vars_of_number):
most-positive-fixnum, most-negative-fixnum are no longer here.
man/ChangeLog addition:
2010-01-23 Aidan Kehoe <kehoea@parhasard.net>
Generally: be careful to say fixnum, not integer, when talking
about fixed-precision integral types. I'm sure I've missed
instances, both here and in the docstrings, but this is a decent
start.
* lispref/text.texi (Columns):
Document where only fixnums, not integers generally, are accepted.
(Registers):
Remove some ancient char-int confoundance here.
* lispref/strings.texi (Creating Strings, Creating Strings):
Be more exact in describing where fixnums but not integers in
general are accepted.
(Creating Strings): Use a more contemporary example to illustrate
how concat deals with lists including integers about #xFF. Delete
some obsolete documentation on same.
(Char Table Types): Document that only fixnums are accepted as
values in syntax tables.
* lispref/searching.texi (String Search, Search and Replace):
Be exact in describing where fixnums but not integers in general
are accepted.
* lispref/range-tables.texi (Range Tables): Be exact in describing
them; only fixnums are accepted to describe ranges.
* lispref/os.texi (Killing XEmacs, User Identification)
(Time of Day, Time Conversion):
Be more exact about using fixnum where only fixed-precision
integers are accepted.
* lispref/objects.texi (Integer Type): Be more exact (and
up-to-date) about the possible values for
integers. Cross-reference to documentation of the bignum extension.
(Equality Predicates):
(Range Table Type):
(Array Type): Use fixnum, not integer, to describe a
fixed-precision integer.
(Syntax Table Type): Correct some English syntax here.
* lispref/numbers.texi (Numbers): Change the phrasing here to use
fixnum to mean the fixed-precision integers normal in emacs.
Document that our terminology deviates from that of Common Lisp,
and that we're working on it.
(Compatibility Issues): Reiterate the Common Lisp versus Emacs
Lisp compatibility issues.
(Comparison of Numbers, Arithmetic Operations):
* lispref/commands.texi (Command Loop Info, Working With Events):
* lispref/buffers.texi (Modification Time):
Be more exact in describing where fixnums but not integers in
general are accepted.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sun, 24 Jan 2010 15:21:27 +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