Mercurial > hg > xemacs-beta
annotate lisp/resize-minibuffer.el @ 5353:38e24b8be4ea
Improve the lexical scoping in #'block, #'return-from.
lisp/ChangeLog addition:
2011-02-07 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el:
* bytecomp.el (byte-compile-initial-macro-environment):
Shadow `block', `return-from' here, we implement them differently
when byte-compiling.
* bytecomp.el (byte-compile-active-blocks): New.
* bytecomp.el (byte-compile-block-1): New.
* bytecomp.el (byte-compile-return-from-1): New.
* bytecomp.el (return-from-1): New.
* bytecomp.el (block-1): New.
These are two aliases that exist to have their own associated
byte-compile functions, which functions implement `block' and
`return-from'.
* cl-extra.el (cl-macroexpand-all):
Fix a bug here when macros in the environment have been compiled.
* cl-macs.el (block):
* cl-macs.el (return):
* cl-macs.el (return-from):
Be more careful about lexical scope in these macros.
* cl.el:
* cl.el ('cl-block-wrapper): Removed.
* cl.el ('cl-block-throw): Removed.
These aren't needed in code generated by this XEmacs. They
shouldn't be needed in code generated by XEmacs 21.4, but if it
turns out the packages do need them, we can put them back.
2011-01-30 Mike Sperber <mike@xemacs.org>
* font-lock.el (font-lock-fontify-pending-extents): Don't fail if
`font-lock-mode' is unset, which can happen in the middle of
`revert-buffer'.
2011-01-23 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (delete):
* cl-macs.el (delq):
* cl-macs.el (remove):
* cl-macs.el (remq):
Don't use the compiler macro if these functions were given the
wrong number of arguments, as happens in lisp-tests.el.
* cl-seq.el (remove, remq): Removed.
I added these to subr.el, and forgot to remove them from here.
2011-01-22 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-setq, byte-compile-set):
Remove kludge allowing keywords' values to be set, all the code
that does that is gone.
* cl-compat.el (elt-satisfies-test-p):
* faces.el (set-face-parent):
* faces.el (face-doc-string):
* gtk-font-menu.el:
* gtk-font-menu.el (gtk-reset-device-font-menus):
* msw-font-menu.el:
* msw-font-menu.el (mswindows-reset-device-font-menus):
* package-get.el (package-get-installedp):
* select.el (select-convert-from-image-data):
* sound.el:
* sound.el (load-sound-file):
* x-font-menu.el (x-reset-device-font-menus-core):
Don't quote keywords, they're self-quoting, and the
win from backward-compatibility is sufficiently small now that the
style problem overrides it.
2011-01-22 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (block, return-from): Require that NAME be a symbol
in these macros, as always documented in the #'block docstring and
as required by Common Lisp.
* descr-text.el (unidata-initialize-unihan-database):
Correct the use of non-symbols in #'block and #'return-from in
this function.
2011-01-15 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (concatenate): Accept more complicated TYPEs in this
function, handing the sequences over to #'coerce if we don't
understand them here.
* cl-macs.el (inline): Don't proclaim #'concatenate as inline, its
compiler macro is more useful than doing that.
2011-01-11 Aidan Kehoe <kehoea@parhasard.net>
* subr.el (delete, delq, remove, remq): Move #'remove, #'remq
here, they don't belong in cl-seq.el; move #'delete, #'delq here
from fns.c, implement them in terms of #'delete*, allowing support
for sequences generally.
* update-elc.el (do-autoload-commands): Use #'delete*, not #'delq
here, now the latter's no longer dumped.
* cl-macs.el (delete, delq): Add compiler macros transforming
#'delete and #'delq to #'delete* calls.
2011-01-10 Aidan Kehoe <kehoea@parhasard.net>
* dialog.el (make-dialog-box): Correct a misplaced parenthesis
here, thank you Mats Lidell in 87zkr9gqrh.fsf@mail.contactor.se !
2011-01-02 Aidan Kehoe <kehoea@parhasard.net>
* dialog.el (make-dialog-box):
* list-mode.el (display-completion-list):
These functions used to use cl-parsing-keywords; change them to
use defun* instead, fixing the build. (Not sure what led to me
not including this change in d1b17a33450b!)
2011-01-02 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (define-star-compiler-macros):
Make sure the form has ITEM and LIST specified before attempting
to change to calls with explicit tests; necessary for some tests
in lisp-tests.el to compile correctly.
(stable-union, stable-intersection): Add compiler macros for these
functions, in the same way we do for most of the other functions
in cl-seq.el.
2011-01-01 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (dolist, dotimes, do-symbols, macrolet)
(symbol-macrolet):
Define these macros with defmacro* instead of parsing the argument
list by hand, for the sake of style and readability; use backquote
where appropriate, instead of calling #'list and and friends, for
the same reason.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* x-misc.el (device-x-display):
Provide this function, documented in the Lispref for years, but
not existing previously. Thank you Julian Bradfield, thank you
Jeff Mincy.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* cl-seq.el:
Move the heavy lifting from this file to C. Dump the
cl-parsing-keywords macro, but don't use defun* for the functions
we define that do take keywords, dynamic scope lossage makes that
not practical.
* subr.el (sort, fillarray): Move these aliases here.
(map-plist): #'nsublis is now built-in, but at this point #'eql
isn't necessarily available as a test; use #'eq.
* obsolete.el (cl-delete-duplicates): Make this available for old
compiler macros and old code.
(memql): Document that this is equivalent to #'member*, and worse.
* cl.el (adjoin, subst): Removed. These are in C.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* simple.el (assoc-ignore-case): Remove a duplicate definition of
this function (it's already in subr.el).
* iso8859-1.el (char-width):
On non-Mule, make this function equivalent to that produced by
(constantly 1), but preserve its docstring.
* subr.el (subst-char-in-string): Define this in terms of
#'substitute, #'nsubstitute.
(string-width): Define this using #'reduce and #'char-width.
(char-width): Give this a simpler definition, it makes far more
sense to check for mule at load time and redefine, as we do in
iso8859-1.el.
(store-substring): Implement this in terms of #'replace, now
#'replace is cheap.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* update-elc.el (lisp-files-needed-for-byte-compilation)
(lisp-files-needing-early-byte-compilation):
cl-macs belongs in the former, not the latter, it is as
fundamental as bytecomp.el.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* cl.el:
Provde the Common Lisp program-error, type-error as error
symbols. This doesn't nearly go far enough for anyone using the
Common Lisp errors.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (delete-duplicates):
If the form has an incorrect number of arguments, don't attempt a
compiler macroexpansion.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (cl-safe-expr-p):
Forms that start with the symbol lambda are also safe.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (= < > <= >=):
For these functions' compiler macros, the optimisation is safe
even if the first and the last arguments have side effects, since
they're only used the once.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (inline-side-effect-free-compiler-macros):
Unroll a loop here at macro-expansion time, so these compiler
macros are compiled. Use #'eql instead of #'eq in a couple of
places for better style.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (notany, notevery): Avoid some dynamic scope
stupidity with local variable names in these functions, when they
weren't prefixed with cl-; go into some more detail in the doc
strings.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (side-effect-free-fns): #'remove, #'remq are
free of side-effects.
(side-effect-and-error-free-fns):
Drop dot, dot-marker from the list.
2010-11-17 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (coerce):
In the argument list, name the first argument OBJECT, not X; the
former name was always used in the doc string and is clearer.
Handle vector type specifications which include the length of the
target sequence, error if there's a mismatch.
* cl-macs.el (cl-make-type-test): Handle type specifications
starting with the symbol 'eql.
2010-11-14 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (eql): Don't remove the byte-compile property of this
symbol. That was necessary to override a bug in bytecomp.el where
#'eql was confused with #'eq, which bug we no longer have.
If neither expression is constant, don't attempt to handle the
expression in this compiler macro, leave it to byte-compile-eql,
which produces better code anyway.
* bytecomp.el (eq): #'eql is not the function associated with the
byte-eq byte code.
(byte-compile-eql): Add an explicit compile method for this
function, for cases where the cl-macs compiler macro hasn't
reduced it to #'eq or #'equal.
2010-10-25 Aidan Kehoe <kehoea@parhasard.net>
Add compiler macros and compilation sanity-checking for various
functions that take keywords.
* byte-optimize.el (side-effect-free-fns): #'symbol-value is
side-effect free and not error free.
* bytecomp.el (byte-compile-normal-call): Check keyword argument
lists for sanity; store information about the positions where
keyword arguments start using the new byte-compile-keyword-start
property.
* cl-macs.el (cl-const-expr-val): Take a new optional argument,
cl-not-constant, defaulting to nil, in this function; return it if
the expression is not constant.
(cl-non-fixnum-number-p): Make this into a separate function, we
want to pass it to #'every.
(eql): Use it.
(define-star-compiler-macros): Use the same code to generate the
member*, assoc* and rassoc* compiler macros; special-case some
code in #'add-to-list in subr.el.
(remove, remq): Add compiler macros for these two functions, in
preparation for #'remove being in C.
(define-foo-if-compiler-macros): Transform (remove-if-not ...) calls to
(remove ... :if-not) at compile time, which will be a real win
once the latter is in C.
(define-substitute-if-compiler-macros)
(define-subst-if-compiler-macros): Similarly for these functions.
(delete-duplicates): Change this compiler macro to use
#'plists-equal; if we don't have information about the type of
SEQUENCE at compile time, don't bother attempting to inline the
call, the function will be in C soon enough.
(equalp): Remove an old commented-out compiler macro for this, if
we want to see it it's in version control.
(subst-char-in-string): Transform this to a call to nsubstitute or
nsubstitute, if that is appropriate.
* cl.el (ldiff): Don't call setf here, this makes for a load-time
dependency problem in cl-macs.el
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* term/vt100.el:
Refer to XEmacs, not GNU Emacs, in permissions.
* term/bg-mouse.el:
* term/sup-mouse.el:
Put copyright notice in canonical "Copyright DATE AUTHOR" form.
Refer to XEmacs, not GNU Emacs, in permissions.
* site-load.el:
Add permission boilerplate.
* mule/canna-leim.el:
* alist.el:
Refer to XEmacs, not APEL/this program, in permissions.
* mule/canna-leim.el:
Remove my copyright, I've assigned it to the FSF.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* gtk.el:
* gtk-widget-accessors.el:
* gtk-package.el:
* gtk-marshal.el:
* gtk-compose.el:
* gnome.el:
Add copyright notice based on internal evidence.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* easymenu.el: Add reference to COPYING to permission notice.
* gutter.el:
* gutter-items.el:
* menubar-items.el:
Fix typo "Xmacs" in permissions notice.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* auto-save.el:
* font.el:
* fontconfig.el:
* mule/kinsoku.el:
Add "part of XEmacs" text to permission notice.
2010-10-14 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (side-effect-free-fns):
* cl-macs.el (remf, getf):
* cl-extra.el (tailp, cl-set-getf, cl-do-remf):
* cl.el (ldiff, endp):
Tighten up Common Lisp compatibility for #'ldiff, #'endp, #'tailp;
add circularity checking for the first two.
#'cl-set-getf and #'cl-do-remf were Lisp implementations of
#'plist-put and #'plist-remprop; change the names to aliases,
changes the macros that use them to using #'plist-put and
#'plist-remprop directly.
2010-10-12 Aidan Kehoe <kehoea@parhasard.net>
* abbrev.el (fundamental-mode-abbrev-table, global-abbrev-table):
Create both these abbrev tables using the usual
#'define-abbrev-table calls, rather than attempting to
special-case them.
* cl-extra.el: Force cl-macs to be loaded here, if cl-extra.el is
being loaded interpreted. Previously other, later files would
redundantly call (load "cl-macs") when interpreted, it's more
reasonable to do it here, once.
* cmdloop.el (read-quoted-char-radix): Use defcustom here, we
don't have any dump-order dependencies that would prevent that.
* custom.el (eval-when-compile): Don't load cl-macs when
interpreted or when byte-compiling, rely on cl-extra.el in the
former case and the appropriate entry in bytecomp-load-hook in the
latter. Get rid of custom-declare-variable-list, we have no
dump-time dependencies that would require it.
* faces.el (eval-when-compile): Don't load cl-macs when
interpreted or when byte-compiling.
* packages.el: Remove some inaccurate comments.
* post-gc.el (cleanup-simple-finalizers): Use #'delete-if-not
here, now the order of preloaded-file-list has been changed to
make it available.
* subr.el (custom-declare-variable-list): Remove. No need for it.
Also remove a stub define-abbrev-table from this file, given the
current order of preloaded-file-list there's no need for it.
2010-10-10 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-constp) Forms quoted with FUNCTION are
also constant.
(byte-compile-initial-macro-environment): In #'the, if FORM is
constant and does not match TYPE, warn at byte-compile time.
2010-10-10 Aidan Kehoe <kehoea@parhasard.net>
* backquote.el (bq-vector-contents, bq-list*): Remove; the former
is equivalent to (append VECTOR nil), the latter to (list* ...).
(bq-process-2): Use (append VECTOR nil) instead of using
#'bq-vector-contents to convert to a list.
(bq-process-1): Now we use list* instead of bq-list
* subr.el (list*): Moved from cl.el, since it is now required to
be available the first time a backquoted form is encountered.
* cl.el (list*): Move to subr.el.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* test-harness.el (Check-Message):
Add an omitted comma here, thank you the buildbot.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* hash-table.el (hash-table-key-list, hash-table-value-list)
(hash-table-key-value-alist, hash-table-key-value-plist):
Remove some useless #'nreverse calls in these files; our hash
tables have no order, it's not helpful to pretend they do.
* behavior.el (read-behavior):
Do the same in this file, in some code evidently copied from
hash-table.el.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* info.el (Info-insert-dir):
* format.el (format-deannotate-region):
* files.el (cd, save-buffers-kill-emacs):
Use #'some, #'every and related functions for applying boolean
operations to lists, instead of rolling our own ones that cons and
don't short-circuit.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-initial-macro-environment):
* cl-macs.el (the):
Rephrase the docstring, make its implementation when compiling
files a little nicer.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* descr-text.el (unidata-initialize-unicodedata-database)
(unidata-initialize-unihan-database, describe-char-unicode-data)
(describe-char-unicode-data):
Wrap calls to the database functions with (with-fboundp ...),
avoiding byte compile warnings on builds without support for the
database functions.
(describe-char): (reduce #'max ...), not (apply #'max ...), no
need to cons needlessly.
(describe-char): Remove a redundant lambda wrapping
#'extent-properties.
(describe-char-unicode-data): Call #'nsubst when replacing "" with
nil in the result of #'split-string, instead of consing inside
mapcar.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* x-faces.el (x-available-font-sizes):
* specifier.el (let-specifier):
* package-ui.el (pui-add-required-packages):
* msw-faces.el (mswindows-available-font-sizes):
* modeline.el (modeline-minor-mode-menu):
* minibuf.el (minibuf-directory-files):
Replace the O2N (delq nil (mapcar (lambda (W) (and X Y)) Z)) with
the ON (mapcan (lambda (W) (and X (list Y))) Z) in these files.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (= < > <= >=):
When these functions are handed more than two arguments, and those
arguments have no side effects, transform to a series of two
argument calls, avoiding funcall in the byte-compiled code.
* mule/mule-cmds.el (finish-set-language-environment):
Take advantage of this change in a function called 256 times at
startup.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-function-form, byte-compile-quote)
(byte-compile-quote-form):
Warn at compile time, and error at runtime, if a (quote ...) or a
(function ...) form attempts to quote more than one object.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (byte-optimize-apply): Transform (apply 'nconc
(mapcar ...)) to (mapcan ...); warn about use of the first idiom.
* update-elc.el (do-autoload-commands):
* packages.el (packages-find-package-library-path):
* frame.el (frame-list):
* extents.el (extent-descendants):
* etags.el (buffer-tag-table-files):
* dumped-lisp.el (preloaded-file-list):
* device.el (device-list):
* bytecomp-runtime.el (proclaim-inline, proclaim-notinline)
Use #'mapcan, not (apply #'nconc (mapcar ...) in all these files.
* bytecomp-runtime.el (eval-when-compile, eval-and-compile):
In passing, mention that these macros also evaluate the body when
interpreted.
tests/ChangeLog addition:
2011-02-07 Aidan Kehoe <kehoea@parhasard.net>
* automated/lisp-tests.el:
Test lexical scope for `block', `return-from'; add a
Known-Bug-Expect-Failure for a contorted example that fails when
byte-compiled.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Mon, 07 Feb 2011 12:01:24 +0000 |
| parents | 5db7720dd944 |
| children | 91b3aa59f49b |
| rev | line source |
|---|---|
| 771 | 1 ;;; resize-minibuffer.el --- dynamically resize minibuffer to display entire contents |
| 2 | |
| 3 ;; Copyright (C) 1990 Roland McGrath | |
| 4 ;; Copyright (C) 1993, 1994 Noah S. Friedman | |
| 5 | |
| 6 ;; Author: Noah Friedman <friedman@prep.ai.mit.edu> | |
| 7 ;; Author: Roland McGrath <roland@prep.ai.mit.edu> | |
| 8 ;; Modified for Lucid Emacs By: Peter Stout <pds@cs.cmu.edu> | |
| 9 ;; Maintainer: friedman@prep.ai.mit.edu | |
| 10 ;; Keywords: minibuffer, window, frames, display | |
| 11 | |
| 12 ;; This file is part of XEmacs. | |
| 13 | |
| 14 ;; XEmacs is free software; you can redistribute it and/or modify it | |
| 15 ;; under the terms of the GNU General Public License as published by | |
| 16 ;; the Free Software Foundation; either version 2, or (at your option) | |
| 17 ;; any later version. | |
| 18 | |
| 19 ;; XEmacs is distributed in the hope that it will be useful, but | |
| 20 ;; WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 21 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 22 ;; General Public License for more details. | |
| 23 | |
| 24 ;; You should have received a copy of the GNU General Public License | |
| 25 ;; along with XEmacs; see the file COPYING. If not, you can either | |
| 26 ;; send email to this program's maintainer or write to: The Free | |
| 27 ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA | |
| 28 ;; 02111-1307, USA. | |
| 29 | |
| 30 ;;; Synched up with: Not synched. Copied from rsz-minibuf.el to | |
| 31 ;;; resize-minibuffer.el to avoid current problems where, when there's a | |
| 32 ;;; file in dump and a file with the same name in packages, a dumping | |
| 33 ;;; XEmacs will find the wrong one! | |
| 34 | |
| 35 ;;; Commentary: | |
| 36 | |
| 37 ;; This file has received maintenance by the XEmacs development team. | |
| 38 | |
| 39 ;; This package allows the entire contents (or as much as possible) of the | |
| 40 ;; minibuffer to be visible at once when typing. As the end of a line is | |
| 41 ;; reached, the minibuffer will resize itself. When the user is done | |
| 42 ;; typing, the minibuffer will return to its original size. | |
| 43 | |
| 44 ;; In window systems where it is possible to have a frame in which the | |
| 45 ;; minibuffer is the only window, the frame itself can be resized. In FSF | |
| 46 ;; GNU Emacs 19.22 and earlier, the frame may not be properly returned to | |
| 47 ;; its original size after it ceases to be active because | |
| 48 ;; `minibuffer-exit-hook' didn't exist until version 19.23. | |
| 49 | |
| 50 ;; NOTE: The code to resize frames has not been tested under Lucid Emacs, | |
| 51 ;; because detached minibuffers are broken. | |
| 52 | |
| 53 ;; Note that the minibuffer and echo area are not the same! They simply | |
| 54 ;; happen to occupy roughly the same place on the frame. Messages put in | |
| 55 ;; the echo area will not cause any resizing by this package. | |
| 56 | |
| 57 ;; This package is considered a minor mode but it doesn't put anything in | |
| 58 ;; minor-mode-alist because this mode is specific to the minibuffer, which | |
| 59 ;; has no modeline. | |
| 60 | |
| 61 ;; To use this package, put the following in your .emacs: | |
| 62 ;; | |
| 63 ;; (autoload 'resize-minibuffer-mode "rsz-minibuf" nil t) | |
| 64 ;; | |
| 65 ;; Invoking the command `resize-minibuffer-mode' will then enable this mode. | |
| 66 | |
| 67 ;;; Code: | |
| 68 | |
| 69 | |
| 70 | |
| 71 (defgroup resize-minibuffer nil | |
| 72 "Dynamically resize minibuffer to display entire contents" | |
| 73 :group 'frames) | |
| 74 | |
| 75 | |
| 76 (defcustom resize-minibuffer-mode nil | |
| 77 "*If non-`nil', resize the minibuffer so its entire contents are visible." | |
| 78 :type 'boolean | |
| 79 :require 'rsz-minibuf | |
| 80 :group 'resize-minibuffer) | |
| 81 | |
| 82 (defcustom resize-minibuffer-window-max-height nil | |
| 83 "*Maximum size the minibuffer window is allowed to become. | |
| 84 If less than 1 or not a number, the limit is the height of the frame in | |
| 85 which the active minibuffer window resides." | |
| 86 :type '(choice (const nil) integer) | |
| 87 :group 'resize-minibuffer) | |
| 88 | |
| 3929 | 89 ;; #### Yeah, I know. The relation between the echo area and the |
| 90 ;; minibuffer needs rethinking. It's not really possible to unify them at | |
| 91 ;; present. -- sjt | |
| 92 (defcustom resize-minibuffer-idle-height nil | |
| 93 "When minibuffer is idle, crop its window to this height. | |
| 94 Must be a positive integer or nil. nil indicates no limit. | |
| 95 Effective only when `undisplay-echo-area-function' respects it. One such | |
| 96 function is `undisplay-echo-area-resize-window'.") | |
| 97 | |
| 771 | 98 (defcustom resize-minibuffer-window-exactly t |
| 99 "*If non-`nil', make minibuffer exactly the size needed to display all its contents. | |
| 100 Otherwise, the minibuffer window can temporarily increase in size but | |
| 101 never get smaller while it is active." | |
| 102 :type 'boolean | |
| 103 :group 'resize-minibuffer) | |
| 104 | |
| 105 | |
| 106 (defcustom resize-minibuffer-frame nil | |
| 107 "*If non-`nil' and the active minibuffer is the sole window in its frame, allow changing the frame height." | |
| 108 :type 'boolean | |
| 109 :group 'resize-minibuffer) | |
| 110 | |
| 111 (defcustom resize-minibuffer-frame-max-height nil | |
| 112 "*Maximum size the minibuffer frame is allowed to become. | |
| 113 If less than 1 or not a number, there is no limit.") | |
| 114 | |
| 115 (defcustom resize-minibuffer-frame-exactly nil | |
| 116 "*If non-`nil', make minibuffer frame exactly the size needed to display all its contents. | |
| 117 Otherwise, the minibuffer frame can temporarily increase in size but | |
| 118 never get smaller while it is active." | |
| 119 :type 'boolean | |
| 120 :group 'resize-minibuffer) | |
| 121 | |
| 122 | |
| 123 (defun resize-minibuffer-mode (&optional prefix) | |
| 124 "Enable or disable resize-minibuffer mode. | |
| 125 A negative prefix argument disables this mode. A positive argument or | |
| 126 argument of 0 enables it. | |
| 127 | |
| 128 When this minor mode is enabled, the minibuffer is dynamically resized to | |
| 129 contain the entire region of text put in it as you type. | |
| 130 | |
| 131 The variable `resize-minibuffer-mode' is set to t or nil depending on | |
| 132 whether this mode is active or not. | |
| 133 | |
| 134 The maximum height to which the minibuffer can grow is controlled by the | |
| 135 variable `resize-minibuffer-window-max-height'. | |
| 136 | |
| 137 The variable `resize-minibuffer-window-exactly' determines whether the | |
| 138 minibuffer window should ever be shrunk to make it no larger than needed to | |
| 139 display its contents. | |
| 140 | |
| 141 When using a window system, it is possible for a minibuffer to be the sole | |
| 142 window in a frame. Since that window is already its maximum size, the only | |
| 143 way to make more text visible at once is to increase the size of the frame. | |
| 144 The variable `resize-minibuffer-frame' controls whether this should be | |
| 145 done. The variables `resize-minibuffer-frame-max-height' and | |
| 146 `resize-minibuffer-frame-exactly' are analogous to their window | |
| 147 counterparts." | |
| 148 (interactive "p") | |
| 149 (or prefix (setq prefix 0)) | |
| 150 (cond | |
| 151 ((>= prefix 0) | |
| 152 (setq resize-minibuffer-mode t)) | |
| 153 (t | |
| 154 (setq resize-minibuffer-mode nil)))) | |
| 155 | |
| 156 (defun resize-minibuffer-setup () | |
| 157 (cond | |
| 158 (resize-minibuffer-mode | |
| 159 (cond | |
| 160 ((and (not (eq 'tty (console-type))) | |
| 161 (eq 'only (plist-get (frame-properties) 'minibuffer))) | |
| 162 (and resize-minibuffer-frame | |
| 163 (progn | |
| 164 (make-local-hook 'minibuffer-exit-hook) | |
| 165 (add-hook 'minibuffer-exit-hook 'resize-minibuffer-frame-restore | |
| 166 nil t) | |
| 167 (make-local-hook 'post-command-hook) | |
| 168 (add-hook 'post-command-hook 'resize-minibuffer-frame nil t) | |
| 776 | 169 (unless (and-boundp 'icomplete-mode icomplete-mode) |
| 771 | 170 (resize-minibuffer-frame))))) |
| 171 (t | |
| 172 (make-local-hook 'post-command-hook) | |
| 173 (add-hook 'post-command-hook 'resize-minibuffer-window nil t) | |
| 776 | 174 (unless (and-boundp 'icomplete-mode icomplete-mode) |
| 771 | 175 (resize-minibuffer-window))))))) |
| 176 | |
| 177 (defun resize-minibuffer-count-window-lines (&optional start end) | |
| 178 "Return number of window lines occupied by text in region. | |
| 179 The number of window lines may be greater than the number of actual lines | |
| 180 in the buffer if any wrap on the display due to their length. | |
| 181 | |
| 182 Optional arguments START and END default to point-min and point-max, | |
| 183 respectively." | |
| 184 (or start (setq start (point-min))) | |
| 185 (or end (setq end (point-max))) | |
| 186 (if (= start end) | |
| 187 0 | |
| 188 (save-excursion | |
| 189 (save-restriction | |
| 190 (widen) | |
| 191 (narrow-to-region start end) | |
| 192 (goto-char start) | |
| 193 (vertical-motion (buffer-size)))))) | |
| 194 | |
| 195 | |
| 196 ;; Resize the minibuffer window to contain the minibuffer's contents. | |
| 197 ;; The minibuffer must be the current window. | |
| 198 (defun resize-minibuffer-window () | |
| 199 (let ((height (window-height)) | |
| 200 (lines (1+ (resize-minibuffer-count-window-lines)))) | |
| 201 (and (numberp resize-minibuffer-window-max-height) | |
| 202 (> resize-minibuffer-window-max-height 0) | |
| 203 (setq lines (min | |
| 204 lines | |
| 205 resize-minibuffer-window-max-height))) | |
| 206 (or (if resize-minibuffer-window-exactly | |
| 207 (= lines height) | |
| 208 (<= lines height)) | |
| 209 (enlarge-window (- lines height))))) | |
| 210 | |
| 211 | |
| 212 ;; Resize the minibuffer frame to contain the minibuffer's contents. | |
| 213 ;; The minibuffer frame must be the current frame. | |
| 214 (defun resize-minibuffer-frame () | |
| 215 (let ((height (frame-height)) | |
| 216 (lines (1+ (resize-minibuffer-count-window-lines)))) | |
| 217 (and (numberp resize-minibuffer-frame-max-height) | |
| 218 (> resize-minibuffer-frame-max-height 0) | |
| 219 (setq lines (min | |
| 220 lines | |
| 221 resize-minibuffer-frame-max-height))) | |
| 222 (cond | |
| 223 ((> lines height) | |
| 224 (set-frame-size (selected-frame) (frame-width) lines)) | |
| 225 ((and resize-minibuffer-frame-exactly | |
| 226 (> height (plist-get minibuffer-frame-plist 'height)) | |
| 227 (< lines height)) | |
| 228 (set-frame-size (selected-frame) (frame-width) lines))))) | |
| 229 | |
| 230 ;; Restore the original height of the frame. | |
| 231 (defun resize-minibuffer-frame-restore () | |
| 232 (set-frame-size (selected-frame) (frame-width) | |
| 233 (plist-get minibuffer-frame-plist 'height))) | |
| 234 | |
| 235 | |
| 236 (provide 'rsz-minibuf) | |
| 237 | |
| 238 (add-hook 'minibuffer-setup-hook 'resize-minibuffer-setup) | |
| 239 | |
| 240 ;;; rsz-minibuf.el ends here |