Mercurial > hg > xemacs-beta
view src/minibuf.c @ 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 | a48ef26d87ee |
children | 308d34e9f07d |
line wrap: on
line source
/* Minibuffer input and completion. Copyright (C) 1985, 1986, 1992-1995 Free Software Foundation, Inc. Copyright (C) 1995 Sun Microsystems, Inc. Copyright (C) 2002, 2010 Ben Wing. 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, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: Mule 2.0, FSF 19.28. Mule-ized except as noted. Substantially different from FSF. */ /* #### dmoore - All sorts of things in here can call lisp, like message. Track all this stuff. */ #include <config.h> #include "lisp.h" #include "buffer.h" #include "commands.h" #include "console-stream.h" #include "events.h" #include "frame-impl.h" #include "insdel.h" #include "redisplay.h" #include "window-impl.h" /* Depth in minibuffer invocations. */ int minibuf_level; Lisp_Object Qcompletion_ignore_case; /* Nonzero means completion ignores case. */ int completion_ignore_case; /* List of regexps that should restrict possible completions. */ Lisp_Object Vcompletion_regexp_list; /* The echo area buffer. */ Lisp_Object Vecho_area_buffer; /* Prompt to display in front of the minibuffer contents */ Lisp_Object Vminibuf_prompt; /* Added on 97/3/14 by Jareth Hein (jhod@po.iijnet.or.jp) for input system support */ /* String to be displayed in front of prompt of the minibuffer contents */ Lisp_Object Vminibuf_preprompt; /* Hook to run just after entry to minibuffer. */ Lisp_Object Qminibuffer_setup_hook, Vminibuffer_setup_hook; Lisp_Object Qappend_message, Qcurrent_message_label, Qclear_message, Qdisplay_message; DEFUN ("minibuffer-depth", Fminibuffer_depth, 0, 0, 0, /* Return current depth of activations of minibuffer, a nonnegative integer. */ ()) { return make_int (minibuf_level); } /* The default buffer to use as the window-buffer of minibuffer windows */ /* Note there is special code in kill-buffer to make this unkillable */ Lisp_Object Vminibuffer_zero; /* Actual minibuffer invocation. */ static Lisp_Object read_minibuffer_internal_unwind (Lisp_Object unwind_data) { Lisp_Object frame; XWINDOW (minibuf_window)->last_modified[CURRENT_DISP] = Qzero; XWINDOW (minibuf_window)->last_modified[DESIRED_DISP] = Qzero; XWINDOW (minibuf_window)->last_modified[CMOTION_DISP] = Qzero; XWINDOW (minibuf_window)->last_facechange[CURRENT_DISP] = Qzero; XWINDOW (minibuf_window)->last_facechange[DESIRED_DISP] = Qzero; XWINDOW (minibuf_window)->last_facechange[CMOTION_DISP] = Qzero; Vminibuf_prompt = Felt (unwind_data, Qzero); minibuf_level = XINT (Felt (unwind_data, make_int (1))); while (CONSP (unwind_data)) { Lisp_Object victim = unwind_data; unwind_data = XCDR (unwind_data); free_cons (victim); } /* If cursor is on the minibuffer line, show the user we have exited by putting it in column 0. */ frame = Fselected_frame (Qnil); if (!noninteractive && !NILP (frame) && !NILP (XFRAME (frame)->minibuffer_window)) { struct window *w = XWINDOW (XFRAME (frame)->minibuffer_window); redisplay_move_cursor (w, 0, 0); } return Qnil; } /* 97/4/13 jhod: Added for input methods */ DEFUN ("set-minibuffer-preprompt", Fset_minibuffer_preprompt, 1, 1, 0, /* Set the minibuffer preprompt string to PREPROMPT. This is used by language input methods to relay state information to the user. */ (preprompt)) { if (NILP (preprompt)) { Vminibuf_preprompt = Qnil; } else { CHECK_STRING (preprompt); Vminibuf_preprompt = LISP_GETTEXT (preprompt); } return Qnil; } DEFUN_NORETURN ("read-minibuffer-internal", Fread_minibuffer_internal, 1, 1, 0, /* Lowest-level interface to minibuffers. Don't call this. */ (prompt)) { /* This function can GC */ /* We used to record the specpdl_depth here, but since call_command_loop never returns, we can never call unbind_to_1. Since we exit via a throw, we let whoever catches unbind for us. */ CHECK_STRING (prompt); single_console_state (); record_unwind_protect (read_minibuffer_internal_unwind, noseeum_cons (Vminibuf_prompt, noseeum_cons (make_int (minibuf_level), Qnil))); Vminibuf_prompt = LISP_GETTEXT (prompt); /* NOTE: Here (or somewhere around here), in FSFmacs 19.30, choose_minibuf_frame() is called. This is the only place in FSFmacs that it's called any more -- there's also a call in xterm.c, but commented out, and 19.28 had the calls in different places. choose_minibuf_frame() does the following: if (!EQ (minibuf_window, selected_frame()->minibuffer_window)) { Fset_window_buffer (selected_frame()->minibuffer_window, XWINDOW (minibuf_window)->buffer); minibuf_window = selected_frame()->minibuffer_window; } #### Note that we don't do the set-window-buffer. This call is similar, but not identical, to a set-window-buffer call made in `read-from-minibuffer' in minibuf.el. I hope it's close enough, because minibuf_window isn't really exported to Lisp. The comment above choose_minibuf_frame() reads: Put minibuf on currently selected frame's minibuffer. We do this whenever the user starts a new minibuffer or when a minibuffer exits. */ minibuf_window = FRAME_MINIBUF_WINDOW (selected_frame ()); run_hook (Qminibuffer_setup_hook); minibuf_level++; clear_echo_area (selected_frame (), Qnil, 0); call_command_loop (Qt); RETURN_NOT_REACHED (Qnil); } /* Completion hair */ /* Compare exactly LEN chars of strings at S1 and S2, ignoring case if appropriate. Return -1 if strings match, else number of chars that match at the beginning. */ /* Note that this function works in Charcounts, unlike most functions. This is necessary for many reasons, one of which is that two strings may match even if they have different numbers of bytes, if IGNORE_CASE is true. */ Charcount scmp_1 (const Ibyte *s1, const Ibyte *s2, Charcount len, int ignore_case) { Charcount l = len; if (ignore_case) { while (l) { Ichar c1 = CANONCASE (0, itext_ichar (s1)); Ichar c2 = CANONCASE (0, itext_ichar (s2)); if (c1 == c2) { l--; INC_IBYTEPTR (s1); INC_IBYTEPTR (s2); } else break; } } else { while (l && itext_ichar (s1) == itext_ichar (s2)) { l--; INC_IBYTEPTR (s1); INC_IBYTEPTR (s2); } } if (l == 0) return -1; else return len - l; } int regexp_ignore_completion_p (const Ibyte *nonreloc, Lisp_Object reloc, Bytecount offset, Bytecount length) { /* Ignore this element if it fails to match all the regexps. */ if (!NILP (Vcompletion_regexp_list)) { EXTERNAL_LIST_LOOP_2 (re, Vcompletion_regexp_list) { CHECK_STRING (re); if (fast_string_match (re, nonreloc, reloc, offset, length, 0, ERROR_ME, 0) < 0) return 1; } } return 0; } /* Callers should GCPRO, since this may call eval */ static int ignore_completion_p (Lisp_Object completion_string, Lisp_Object pred, Lisp_Object completion) { if (regexp_ignore_completion_p (0, completion_string, 0, -1)) return 1; /* Ignore this element if there is a predicate and the predicate doesn't like it. */ if (!NILP (pred)) { Lisp_Object tem; if (EQ (pred, Qcommandp)) tem = Fcommandp (completion); else tem = call1 (pred, completion); if (NILP (tem)) return 1; } return 0; } /* #### Maybe we should allow COLLECTION to be a hash table. It is wrong for the use of obarrays to be better-rewarded than the use of hash tables. By better-rewarded I mean that you can pass an obarray to all of the completion functions, whereas you can't do anything like that with a hash table. To do so, there should probably be a map_obarray_or_alist_or_hash_table function which would be used by both Ftry_completion and Fall_completions. [[ But would the additional funcalls slow things down? ]] Seriously doubtful. --ben */ DEFUN ("try-completion", Ftry_completion, 2, 3, 0, /* Return common substring of all completions of STRING in COLLECTION. COLLECTION must be an alist, an obarray, or a function. Each string in COLLECTION is tested to see if it begins with STRING. All that match are compared together; the longest initial sequence common to all matches is returned as a string. If there is no match at all, nil is returned. For an exact match, t is returned. If COLLECTION is list, the elements of the list that are not cons cells and the cars of the elements of the list that are cons cells (which must be strings) form the set of possible completions. If COLLECTION is an obarray, the names of all symbols in the obarray are the possible completions. If COLLECTION is a function, it is called with three arguments: the values STRING, PREDICATE and nil. Whatever it returns becomes the value of `try-completion'. If optional third argument PREDICATE is non-nil, it is used to test each possible match. The match is a candidate only if PREDICATE returns non-nil. The argument given to PREDICATE is the alist element or the symbol from the obarray. */ (string, collection, predicate)) { /* This function can GC */ Lisp_Object bestmatch, tail; Charcount bestmatchsize = 0; int list; int indice = 0; int matchcount = 0; int obsize; Lisp_Object bucket; Charcount slength, blength; CHECK_STRING (string); if (CONSP (collection)) { Lisp_Object tem = XCAR (collection); if (SYMBOLP (tem)) /* lambda, autoload, etc. Emacs-lisp sucks */ return call3 (collection, string, predicate, Qnil); else list = 1; } else if (VECTORP (collection)) list = 0; else if (NILP (collection)) list = 1; else return call3 (collection, string, predicate, Qnil); bestmatch = Qnil; blength = 0; slength = string_char_length (string); /* If COLLECTION is not a list, set TAIL just for gc pro. */ tail = collection; if (!list) { obsize = XVECTOR_LENGTH (collection); bucket = XVECTOR_DATA (collection)[indice]; } else /* warning suppression */ { obsize = 0; bucket = Qnil; } while (1) { /* Get the next element of the alist or obarray. */ /* Exit the loop if the elements are all used up. */ /* elt gets the alist element or symbol. eltstring gets the name to check as a completion. */ Lisp_Object elt; Lisp_Object eltstring; if (list) { if (NILP (tail)) break; elt = Fcar (tail); if (CONSP (elt)) eltstring = Fcar (elt); else eltstring = elt; tail = Fcdr (tail); } else { if (!ZEROP (bucket)) { Lisp_Symbol *next; if (!SYMBOLP (bucket)) { invalid_argument ("Bad obarray passed to try-completions", bucket); } next = symbol_next (XSYMBOL (bucket)); elt = bucket; eltstring = Fsymbol_name (elt); if (next) bucket = wrap_symbol (next); else bucket = Qzero; } else if (++indice >= obsize) break; else { bucket = XVECTOR_DATA (collection)[indice]; continue; } } /* Is this element a possible completion? */ if (STRINGP (eltstring)) { Charcount eltlength = string_char_length (eltstring); if (slength <= eltlength && (0 > scmp (XSTRING_DATA (eltstring), XSTRING_DATA (string), slength))) { { struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; int loser; GCPRO4 (tail, string, eltstring, bestmatch); loser = ignore_completion_p (eltstring, predicate, elt); UNGCPRO; if (loser) /* reject this one */ continue; } /* Update computation of how much all possible completions match */ matchcount++; if (NILP (bestmatch)) { bestmatch = eltstring; blength = eltlength; bestmatchsize = eltlength; } else { Charcount compare = min (bestmatchsize, eltlength); Charcount matchsize = scmp (XSTRING_DATA (bestmatch), XSTRING_DATA (eltstring), compare); if (matchsize < 0) matchsize = compare; if (completion_ignore_case) { /* If this is an exact match except for case, use it as the best match rather than one that is not an exact match. This way, we get the case pattern of the actual match. */ if ((matchsize == eltlength && matchsize < blength) || /* If there is more than one exact match ignoring case, and one of them is exact including case, prefer that one. */ /* If there is no exact match ignoring case, prefer a match that does not change the case of the input. */ ((matchsize == eltlength) == (matchsize == blength) && 0 > scmp_1 (XSTRING_DATA (eltstring), XSTRING_DATA (string), slength, 0) && 0 <= scmp_1 (XSTRING_DATA (bestmatch), XSTRING_DATA (string), slength, 0))) { bestmatch = eltstring; blength = eltlength; } } bestmatchsize = matchsize; } } } } if (NILP (bestmatch)) return Qnil; /* No completions found */ /* If we are ignoring case, and there is no exact match, and no additional text was supplied, don't change the case of what the user typed. */ if (completion_ignore_case && bestmatchsize == slength && blength > bestmatchsize) return string; /* Return t if the supplied string is an exact match (counting case); it does not require any change to be made. */ if (matchcount == 1 && bestmatchsize == slength && 0 > scmp_1 (XSTRING_DATA (bestmatch), XSTRING_DATA (string), bestmatchsize, 0)) return Qt; /* Else extract the part in which all completions agree */ return Fsubseq (bestmatch, Qzero, make_int (bestmatchsize)); } DEFUN ("all-completions", Fall_completions, 2, 3, 0, /* Search for partial matches to STRING in COLLECTION. COLLECTION must be an alist, an obarray, or a function. Each string in COLLECTION is tested to see if it begins with STRING. The value is a list of all the strings from COLLECTION that match. If COLLECTION is an alist, the cars of the elements of the alist \(which must be strings) form the set of possible completions. If COLLECTION is an obarray, the names of all symbols in the obarray are the possible completions. If COLLECTION is a function, it is called with three arguments: the values STRING, PREDICATE and t. Whatever it returns becomes the value of `all-completions'. If optional third argument PREDICATE is non-nil, it is used to test each possible match. The match is a candidate only if PREDICATE returns non-nil. The argument given to PREDICATE is the alist element or the symbol from the obarray. */ (string, collection, predicate)) { /* This function can GC */ Lisp_Object tail; Lisp_Object allmatches; int list; int indice = 0; int obsize; Lisp_Object bucket; Charcount slength; CHECK_STRING (string); if (CONSP (collection)) { Lisp_Object tem = XCAR (collection); if (SYMBOLP (tem)) /* lambda, autoload, etc. Emacs-lisp sucks */ return call3 (collection, string, predicate, Qt); else list = 1; } else if (VECTORP (collection)) list = 0; else if (NILP (collection)) list = 1; else return call3 (collection, string, predicate, Qt); allmatches = Qnil; slength = string_char_length (string); /* If COLLECTION is not a list, set TAIL just for gc pro. */ tail = collection; if (!list) { obsize = XVECTOR_LENGTH (collection); bucket = XVECTOR_DATA (collection)[indice]; } else /* warning suppression */ { obsize = 0; bucket = Qnil; } while (1) { /* Get the next element of the alist or obarray. */ /* Exit the loop if the elements are all used up. */ /* elt gets the alist element or symbol. eltstring gets the name to check as a completion. */ Lisp_Object elt; Lisp_Object eltstring; if (list) { if (NILP (tail)) break; elt = Fcar (tail); eltstring = Fcar (elt); tail = Fcdr (tail); } else { if (!ZEROP (bucket)) { Lisp_Symbol *next = symbol_next (XSYMBOL (bucket)); elt = bucket; eltstring = Fsymbol_name (elt); if (next) bucket = wrap_symbol (next); else bucket = Qzero; } else if (++indice >= obsize) break; else { bucket = XVECTOR_DATA (collection)[indice]; continue; } } /* Is this element a possible completion? */ if (STRINGP (eltstring) && (slength <= string_char_length (eltstring)) /* Reject alternatives that start with space unless the input starts with space. */ && ((string_char_length (string) > 0 && string_ichar (string, 0) == ' ') || string_ichar (eltstring, 0) != ' ') && (0 > scmp (XSTRING_DATA (eltstring), XSTRING_DATA (string), slength))) { /* Yes. Now check whether predicate likes it. */ struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; int loser; GCPRO4 (tail, eltstring, allmatches, string); loser = ignore_completion_p (eltstring, predicate, elt); UNGCPRO; if (!loser) /* Ok => put it on the list. */ allmatches = Fcons (eltstring, allmatches); } } return Fnreverse (allmatches); } /* Useless FSFmacs functions */ /* More than useless. I've nuked minibuf_prompt_width so they won't function at all in XEmacs at the moment. They are used to implement some braindamage in FSF which we aren't including. --cet */ #if 0 DEFUN ("minibuffer-prompt", Fminibuffer_prompt, 0, 0, 0, /* Return the prompt string of the currently-active minibuffer. If no minibuffer is active, return nil. */ ()) { return Fcopy_sequence (Vminibuf_prompt); } DEFUN ("minibuffer-prompt-width", Fminibuffer_prompt_width, 0, 0, 0, /* Return the display width of the minibuffer prompt. */ ()) { return make_int (minibuf_prompt_width); } #endif /* 0 */ /************************************************************************/ /* echo area */ /************************************************************************/ extern int stdout_needs_newline; static Lisp_Object clear_echo_area_internal (struct frame *f, Lisp_Object label, int from_print, int no_restore) { /* This function can call lisp */ if (!NILP (Ffboundp (Qclear_message))) { Lisp_Object frame = wrap_frame (f); return call4 (Qclear_message, label, frame, from_print ? Qt : Qnil, no_restore ? Qt : Qnil); } else { stderr_out ("\n"); return Qnil; } } Lisp_Object clear_echo_area (struct frame *f, Lisp_Object label, int no_restore) { /* This function can call lisp */ return clear_echo_area_internal (f, label, 0, no_restore); } Lisp_Object clear_echo_area_from_print (struct frame *f, Lisp_Object label, int no_restore) { /* This function can call lisp */ return clear_echo_area_internal (f, label, 1, no_restore); } void echo_area_append (struct frame *f, const Ibyte *nonreloc, Lisp_Object reloc, Bytecount offset, Bytecount length, Lisp_Object label) { /* This function can call lisp */ Lisp_Object obj; struct gcpro gcpro1; Lisp_Object frame; /* There is an inlining bug in egcs-20000131 c++ that can be worked around as follows: */ #if defined (__GNUC__) && defined (__cplusplus) alloca (4); #endif /* some callers pass in a null string as a way of clearing the echo area. check for length == 0 now; if this case, neither nonreloc nor reloc may be valid. */ if (length == 0) return; fixup_internal_substring (nonreloc, reloc, offset, &length); /* also check it here, in case the string was really blank. */ if (length == 0) return; if (!NILP (Ffboundp (Qappend_message))) { if (STRINGP (reloc) && offset == 0 && length == XSTRING_LENGTH (reloc)) obj = reloc; else { if (STRINGP (reloc)) nonreloc = XSTRING_DATA (reloc); obj = make_string (nonreloc + offset, length); } frame = wrap_frame (f); GCPRO1 (obj); call4 (Qappend_message, label, obj, frame, EQ (label, Qprint) ? Qt : Qnil); UNGCPRO; } else { if (STRINGP (reloc)) nonreloc = XSTRING_DATA (reloc); write_string_1 (Qexternal_debugging_output, nonreloc + offset, length); } } void echo_area_message (struct frame *f, const Ibyte *nonreloc, Lisp_Object reloc, Bytecount offset, Bytecount length, Lisp_Object label) { /* This function can call lisp */ clear_echo_area (f, label, 1); echo_area_append (f, nonreloc, reloc, offset, length, label); } int echo_area_active (struct frame *UNUSED (f)) { /* By definition, the echo area is active if the echo-area buffer is not empty. No need to call Lisp code. (Anyway, this function is called from redisplay.) */ struct buffer *echo_buffer = XBUFFER (Vecho_area_buffer); return BUF_BEGV (echo_buffer) != BUF_ZV (echo_buffer); } Lisp_Object echo_area_status (struct frame *f) { /* This function can call lisp */ if (!NILP (Ffboundp (Qcurrent_message_label))) { Lisp_Object frame = wrap_frame (f); return call1 (Qcurrent_message_label, frame); } else return stdout_needs_newline ? Qmessage : Qnil; } Lisp_Object echo_area_contents (struct frame *UNUSED (f)) { /* See above. By definition, the contents of the echo-area buffer are the contents of the echo area. */ return Fbuffer_substring (Qnil, Qnil, Vecho_area_buffer); } /* Dump an informative message to the echo area. This function takes a string in internal format. */ void message_internal (const Ibyte *nonreloc, Lisp_Object reloc, Bytecount offset, Bytecount length) { /* This function can call lisp */ if (NILP (Vexecuting_macro)) echo_area_message (selected_frame (), nonreloc, reloc, offset, length, Qmessage); } void message_append_internal (const Ibyte *nonreloc, Lisp_Object reloc, Bytecount offset, Bytecount length) { /* This function can call lisp */ if (NILP (Vexecuting_macro)) echo_area_append (selected_frame (), nonreloc, reloc, offset, length, Qmessage); } /* The next three functions are interfaces to message_internal() that take strings in external format. message() does I18N3 translating on the format string; message_no_translate() does not. */ static void message_1 (const CIbyte *fmt, va_list args) { /* This function can call lisp */ if (fmt) { struct gcpro gcpro1; /* message_internal() might GC, e.g. if there are after-change-hooks on the echo area buffer */ Lisp_Object obj = emacs_vsprintf_string (fmt, args); GCPRO1 (obj); message_internal (0, obj, 0, -1); UNGCPRO; } else message_internal (0, Qnil, 0, 0); } static void message_append_1 (const CIbyte *fmt, va_list args) { /* This function can call lisp */ if (fmt) { struct gcpro gcpro1; /* message_internal() might GC, e.g. if there are after-change-hooks on the echo area buffer */ Lisp_Object obj = emacs_vsprintf_string (fmt, args); GCPRO1 (obj); message_append_internal (0, obj, 0, -1); UNGCPRO; } else message_append_internal (0, Qnil, 0, 0); } void clear_message (void) { /* This function can call lisp */ message_internal (0, Qnil, 0, 0); } void message (const char *fmt, ...) { /* This function can call lisp */ /* I think it's OK to pass the data of Lisp strings as arguments to this function. No GC'ing will occur until the data has already been copied. */ va_list args; va_start (args, fmt); if (fmt) fmt = GETTEXT (fmt); message_1 (fmt, args); va_end (args); } void message_append (const char *fmt, ...) { /* This function can call lisp */ va_list args; va_start (args, fmt); if (fmt) fmt = GETTEXT (fmt); message_append_1 (fmt, args); va_end (args); } void message_no_translate (const char *fmt, ...) { /* This function can call lisp */ /* I think it's OK to pass the data of Lisp strings as arguments to this function. No GC'ing will occur until the data has already been copied. */ va_list args; va_start (args, fmt); message_1 (fmt, args); va_end (args); } /************************************************************************/ /* initialization */ /************************************************************************/ void syms_of_minibuf (void) { DEFSYMBOL (Qminibuffer_setup_hook); DEFSYMBOL (Qcompletion_ignore_case); DEFSUBR (Fminibuffer_depth); #if 0 DEFSUBR (Fminibuffer_prompt); DEFSUBR (Fminibuffer_prompt_width); #endif DEFSUBR (Fset_minibuffer_preprompt); DEFSUBR (Fread_minibuffer_internal); DEFSUBR (Ftry_completion); DEFSUBR (Fall_completions); DEFSYMBOL (Qappend_message); DEFSYMBOL (Qclear_message); DEFSYMBOL (Qdisplay_message); DEFSYMBOL (Qcurrent_message_label); } void reinit_vars_of_minibuf (void) { minibuf_level = 0; } void vars_of_minibuf (void) { staticpro (&Vminibuf_prompt); Vminibuf_prompt = Qnil; /* Added by Jareth Hein (jhod@po.iijnet.or.jp) for input system support */ staticpro (&Vminibuf_preprompt); Vminibuf_preprompt = Qnil; DEFVAR_LISP ("minibuffer-setup-hook", &Vminibuffer_setup_hook /* Normal hook run just after entry to minibuffer. */ ); Vminibuffer_setup_hook = Qnil; DEFVAR_BOOL ("completion-ignore-case", &completion_ignore_case /* Non-nil means don't consider case significant in completion. */ ); completion_ignore_case = 0; DEFVAR_LISP ("completion-regexp-list", &Vcompletion_regexp_list /* List of regexps that should restrict possible completions. Each completion has to match all regexps in this list. */ ); Vcompletion_regexp_list = Qnil; } void reinit_complex_vars_of_minibuf (void) { /* This function can GC */ #ifdef I18N3 /* #### This needs to be fixed up so that the gettext() gets called at runtime instead of at load time. */ #endif Vminibuffer_zero = Fget_buffer_create (build_ascstring (" *Minibuf-0*")); staticpro_nodump (&Vminibuffer_zero); Vecho_area_buffer = Fget_buffer_create (build_ascstring (" *Echo Area*")); staticpro_nodump (&Vecho_area_buffer); } void complex_vars_of_minibuf (void) { reinit_complex_vars_of_minibuf (); }