Mercurial > hg > xemacs-beta
view src/cmdloop.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 | 838630c0734f |
children | 308d34e9f07d |
line wrap: on
line source
/* Editor command loop. Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc. Copyright (C) 1995, 1996, 2001, 2002, 2003, 2005 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. Not synched with FSF. This was renamed from keyboard.c. However, it only contains the command-loop stuff from FSF's keyboard.c; all the rest is in event*.c, console.c, or signal.c. */ /* #### This module purports to separate out the command-loop stuff from event-stream.c, but it doesn't really. Perhaps this file should just be merged into event-stream.c, given its shortness. */ #include <config.h> #include "lisp.h" #include "buffer.h" #include "console-impl.h" #include "device.h" #include "commands.h" #include "frame.h" #include "events.h" #include "window.h" #ifdef HAVE_MS_WINDOWS #include "console-msw.h" #endif /* Current depth in recursive edits. */ Fixnum command_loop_level; #ifndef LISP_COMMAND_LOOP /* Form to evaluate (if non-nil) when Emacs is started. */ Lisp_Object Vtop_level; #else /* Function to call to evaluate to read and process events. */ Lisp_Object Vcommand_loop; #endif /* LISP_COMMAND_LOOP */ Lisp_Object Venter_window_hook, Vleave_window_hook; Lisp_Object Qdisabled_command_hook, Vdisabled_command_hook; /* The error handler. */ Lisp_Object Qcommand_error; /* The emergency error handler, before we're ready. */ Lisp_Object Qreally_early_error_handler; /* Variable defined in Lisp. */ Lisp_Object Qerrors_deactivate_region; Lisp_Object Qtop_level; Lisp_Object Vminibuffer_echo_wait_function; #ifdef LISP_COMMAND_LOOP static Lisp_Object command_loop_1 (Lisp_Object dummy); EXFUN (Fcommand_loop_1, 0); #else static DECLARE_DOESNT_RETURN_TYPE (Lisp_Object, command_loop_1 (Lisp_Object dummy)); EXFUN_NORETURN (Fcommand_loop_1, 0); #endif /* There are two possible command loops -- one written entirely in C and one written mostly in Lisp, except stuff written in C for speed. The advantage of the Lisp command loop is that the user can specify their own command loop to use by changing the variable `command-loop'. Its disadvantage is that it's slow. */ static Lisp_Object default_error_handler (Lisp_Object data) { int speccount = specpdl_depth (); /* None of this is invoked, normally. This code is almost identical to the `command-error' function, except `command-error' does cool tricks with sounds. This function is a fallback, invoked if command-error is unavailable. */ Fding (Qnil, Qnil, Qnil); if (!NILP (Fboundp (Qerrors_deactivate_region)) && !NILP (Fsymbol_value (Qerrors_deactivate_region))) zmacs_deactivate_region (); Fdiscard_input (); specbind (Qinhibit_quit, Qt); Vstandard_output = Qt; Vstandard_input = Qt; Vexecuting_macro = Qnil; Fset (intern ("last-error"), data); clear_echo_area (selected_frame (), Qnil, 0); Fdisplay_error (data, Qt); check_quit (); /* make Vquit_flag accurate */ Vquit_flag = Qnil; return (unbind_to_1 (speccount, Qt)); } DEFUN_NORETURN ("really-early-error-handler", Freally_early_error_handler, 1, 1, 0, /* You should almost certainly not be using this. */ (x)) { /* This is an error handler used when we're running temacs and when we're in the early stages of XEmacs. No errors ought to be occurring in those cases (or they ought to be trapped and dealt with elsewhere), but if an error slips through, we need to deal with it. We could write this function in Lisp (and it used to be this way, at the beginning of loadup.el), but we do it this way in case an error occurs before we get to loading loadup.el. Note that there is also an `early-error-handler', used in startup.el to catch more reasonable errors that might occur during startup if the sysadmin or whoever fucked up. This function is more conservative in what it does and is used only as a last resort, indicating that the programmer himself fucked up somewhere. */ stderr_out ("*** Error in XEmacs initialization"); Fprint (x, Qexternal_debugging_output); stderr_out ("*** Backtrace\n"); Fbacktrace (Qexternal_debugging_output, Qt); stderr_out ("*** Killing XEmacs\n"); #ifdef DEBUG_XEMACS /* When configured --with-debug, and debug-on-error is set, exit to the debugger and abort. This will happen during loadup/dumping. There is also code in signal_call_debugger() to do the same whenever running noninteractively. That's intended for use debugging e.g. batch byte compilation, AFTER dumping has already happened, where the XEMACSDEBUG variable can be set to '(setq debug-on-error t)' to trigger the behavior. Why do we need to duplicate the bomb-out check here? Well, signal_call_debugger() doesn't want to bomb out unless it has an uncaught error, and in this case, we've installed a call-with-condition-case handler, and so signal_call_debugger() can't bomb out before calling us. If we returned and let the error be processed further, it *would* trigger the bomb-out-to-debugger behavior, but in fact it never gets there because we do `kill-emacs'. Therefore, we have to provide the bomb-to-debugger feature ourselves. */ if (!NILP (Vdebug_on_error)) { stderr_out ("XEmacs exiting to debugger.\n"); Fforce_debugging_signal (Qt); } #endif #if defined (HAVE_MS_WINDOWS) && defined (WIN32_NATIVE) /* Don't do this under Cygwin, since we have output on stderr. */ Fmswindows_message_box (build_msg_string ("Initialization error"), Qnil, Qnil); #endif Fkill_emacs (make_int (-1)); RETURN_NOT_REACHED (Qnil); } /**********************************************************************/ /* Command-loop (in C) */ /**********************************************************************/ #ifndef LISP_COMMAND_LOOP /* The guts of the command loop are in command_loop_1(). This function doesn't catch errors, though -- that's the job of command_loop_2(), which is a condition-case wrapper around command_loop_1(). command_loop_1() never returns, but may get thrown out of. When an error occurs, cmd_error() is called, which usually invokes the Lisp error handler in `command-error'; however, a default error handler is provided if `command-error' is nil (e.g. during startup). The purpose of the error handler is simply to display the error message and do associated cleanup; it does not need to throw anywhere. When the error handler finishes, the condition-case in command_loop_2() will finish and command_loop_2() will reinvoke command_loop_1(). command_loop_2() is invoked from three places: from initial_command_loop() (called from main() at the end of internal initialization), from the Lisp function `recursive-edit', and from call_command_loop(). call_command_loop() is called when a macro is started and when the minibuffer is entered; normal termination of the macro or minibuffer causes a throw out of the recursive command loop. (To `execute-kbd-macro' for macros and `exit' for minibuffers. Note also that the low-level minibuffer-entering function, `read-minibuffer-internal', provides its own error handling and does not need command_loop_2()'s error encapsulation; so it tells call_command_loop() to invoke command_loop_1() directly.) Note that both read-minibuffer-internal and recursive-edit set up a catch for `exit'; this is why `abort-recursive-edit', which throws to this catch, exits out of either one. initial_command_loop(), called from main(), sets up a catch for `top-level' when invoking command_loop_2(), allowing functions to throw all the way to the top level if they really need to. Before invoking command_loop_2(), initial_command_loop() calls top_level_1(), which handles all of the startup stuff (creating the initial frame, handling the command-line options, loading the user's .emacs file, etc.). The function that actually does this is in Lisp and is pointed to by the variable `top-level'; normally this function is `normal-top-level'. top_level_1() is just an error-handling wrapper similar to command_loop_2(). Note also that initial_command_loop() sets up a catch for `top-level' when invoking top_level_1(), just like when it invokes command_loop_2(). */ static Lisp_Object cmd_error (Lisp_Object data, Lisp_Object UNUSED (dummy)) { /* This function can GC */ check_quit (); /* make Vquit_flag accurate */ Vquit_flag = Qnil; any_console_state (); if (!NILP (Ffboundp (Qcommand_error))) return call1 (Qcommand_error, data); return default_error_handler (data); } static Lisp_Object top_level_1 (Lisp_Object UNUSED (dummy)) { /* This function can GC */ /* On entry to the outer level, run the startup file */ if (!NILP (Vtop_level)) condition_case_1 (Qerror, Feval, Vtop_level, cmd_error, Qnil); #if 1 else { message ("\ntemacs can only be run in -batch mode."); noninteractive = 1; /* prevent things under kill-emacs from blowing up */ Fkill_emacs (make_int (-1)); } #else else if (purify_flag) message ("Bare impure Emacs (standard Lisp code not loaded)"); else message ("Bare Emacs (standard Lisp code not loaded)"); #endif return Qnil; } /* Here we catch errors in execution of commands within the editing loop, and reenter the editing loop. When there is an error, cmd_error runs and the call to condition_case_1() returns. */ /* Avoid confusing the compiler. A helper function for command_loop_2 */ static DECLARE_DOESNT_RETURN (command_loop_3 (void)); static DOESNT_RETURN command_loop_3 (void) { /* * If we are inside of a menu callback we cannot reenter the command loop * because we will deadlock, as no input is allowed. */ if (in_modal_loop) invalid_operation ("Attempt to enter command loop inside menu callback", Qunbound); /* This function can GC */ for (;;) { condition_case_1 (Qerror, command_loop_1, Qnil, cmd_error, Qnil); /* #### wrong with selected-console? */ /* See command in initial_command_loop about why this value is 0. */ reset_this_command_keys (Vselected_console, 0); } } static DECLARE_DOESNT_RETURN_TYPE (Lisp_Object, command_loop_2 (Lisp_Object)); static DOESNT_RETURN_TYPE (Lisp_Object) command_loop_2 (Lisp_Object UNUSED (dummy)) { command_loop_3(); /* doesn't return */ RETURN_NOT_REACHED (Qnil); } /* This is called from emacs.c when it's done with initialization. */ DOESNT_RETURN initial_command_loop (Lisp_Object load_me) { /* This function can GC */ if (!NILP (load_me)) Vtop_level = list2 (Qload, load_me); /* First deal with startup and command-line arguments. A throw to `top-level' gets us back here directly (does this ever happen?). Otherwise, this function will return normally when all command- line arguments have been processed, the user's initialization file has been read in, and the first frame has been created. */ internal_catch (Qtop_level, top_level_1, Qnil, 0, 0, 0); /* If an error occurred during startup and the initial console wasn't created, then die now (the error was already printed out on the terminal device). */ if (!noninteractive && (!CONSOLEP (Vselected_console) || CONSOLE_STREAM_P (XCONSOLE (Vselected_console)))) Fkill_emacs (make_int (-1)); /* End of -batch run causes exit here. */ if (noninteractive) Fkill_emacs (Qt); for (;;) { command_loop_level = 0; MARK_MODELINE_CHANGED; /* Now invoke the command loop. It never returns; however, a throw to `top-level' will place us at the end of this loop. */ internal_catch (Qtop_level, command_loop_2, Qnil, 0, 0, 0); /* #### wrong with selected-console? */ /* We don't actually call clear_echo_area() here, partially at least because that runs Lisp code and it may be unsafe to do so -- we are outside of the normal catches for errors and such. */ reset_this_command_keys (Vselected_console, 0); } } /* This function is invoked when a macro or minibuffer starts up. Normal termination of the macro or minibuffer causes a throw past us. See the comment above. Note that this function never returns (but may be thrown out of). */ DOESNT_RETURN_TYPE (Lisp_Object) call_command_loop (Lisp_Object catch_errors) { /* This function can GC */ if (NILP (catch_errors)) command_loop_1 (Qnil); else command_loop_2 (Qnil); RETURN_NOT_REACHED (Qnil); } static Lisp_Object recursive_edit_unwind (Lisp_Object buffer) { if (!NILP (buffer)) Fset_buffer (buffer); command_loop_level--; MARK_MODELINE_CHANGED; return Qnil; } DEFUN ("recursive-edit", Frecursive_edit, 0, 0, "", /* Invoke the editor command loop recursively. To get out of the recursive edit, a command can do `(throw 'exit nil)'; that tells this function to return. Alternately, `(throw 'exit t)' makes this function signal an error. */ ()) { /* This function can GC */ Lisp_Object val; int speccount = specpdl_depth (); command_loop_level++; MARK_MODELINE_CHANGED; record_unwind_protect (recursive_edit_unwind, current_buffer != XWINDOW_XBUFFER (Fselected_window (Qnil)) ? Fcurrent_buffer () : Qnil); specbind (Qstandard_output, Qt); specbind (Qstandard_input, Qt); val = internal_catch (Qexit, command_loop_2, Qnil, 0, 0, 0); if (EQ (val, Qt)) /* Turn abort-recursive-edit into a quit. */ Fsignal (Qquit, Qnil); return unbind_to (speccount); } #endif /* !LISP_COMMAND_LOOP */ /**********************************************************************/ /* Alternate command-loop (largely in Lisp) */ /**********************************************************************/ #ifdef LISP_COMMAND_LOOP static Lisp_Object load1 (Lisp_Object name) { /* This function can GC */ call4 (Qload, name, Qnil, Qt, Qnil); return (Qnil); } /* emergency backups for cold-load-stream use */ static Lisp_Object cold_load_command_error (Lisp_Object datum, Lisp_Object ignored) { /* This function can GC */ check_quit (); /* make Vquit_flag accurate */ Vquit_flag = Qnil; return default_error_handler (datum); } static Lisp_Object cold_load_command_loop (Lisp_Object dummy) { /* This function can GC */ return (condition_case_1 (Qt, command_loop_1, Qnil, cold_load_command_error, Qnil)); } DOESNT_RETURN_TYPE (Lisp_Object) call_command_loop (Lisp_Object catch_errors) { /* This function can GC */ reset_this_command_keys (Vselected_console, 0); /* #### bleagh */ loop: for (;;) { if (NILP (Vcommand_loop)) break; call1 (Vcommand_loop, catch_errors); } /* This isn't a "correct" definition, but you're pretty hosed if you broke "command-loop" anyway */ /* #### not correct with Vselected_console */ XCONSOLE (Vselected_console)->prefix_arg = Qnil; if (NILP (catch_errors)) Fcommand_loop_1 (); else internal_catch (Qtop_level, cold_load_command_loop, Qnil, 0, 0, 0); goto loop; RETURN_NOT_REACHED (Qnil); } static Lisp_Object initial_error_handler (Lisp_Object datum, Lisp_Object ignored) { /* This function can GC */ Vcommand_loop = Qnil; Fding (Qnil, Qnil, Qnil); if (CONSP (datum) && EQ (XCAR (datum), Qquit)) /* Don't bother with the message */ return (Qt); message ("Error in command-loop!!"); Fset (intern ("last-error"), datum); /* #### Better/different name? */ Fsit_for (make_int (2), Qnil); cold_load_command_error (datum, Qnil); return (Qt); } DOESNT_RETURN initial_command_loop (Lisp_Object load_me) { /* This function can GC */ if (!NILP (load_me)) { if (!NILP (condition_case_1 (Qt, load1, load_me, initial_error_handler, Qnil))) Fkill_emacs (make_int (-1)); } for (;;) { command_loop_level = 0; MARK_MODELINE_CHANGED; condition_case_1 (Qt, call_command_loop, Qtop_level, initial_error_handler, Qnil); } } #endif /* LISP_COMMAND_LOOP */ /**********************************************************************/ /* Guts of command loop */ /**********************************************************************/ #ifdef LISP_COMMAND_LOOP static Lisp_Object #else static DOESNT_RETURN_TYPE (Lisp_Object) #endif command_loop_1 (Lisp_Object UNUSED (dummy)) { /* This function can GC */ /* #### not correct with Vselected_console */ XCONSOLE (Vselected_console)->prefix_arg = Qnil; Fcommand_loop_1 (); #ifdef LISP_COMMAND_LOOP return Qnil; #else RETURN_NOT_REACHED (Qnil); #endif } /* This is the actual command reading loop, sans error-handling encapsulation. This is used for both the C and Lisp command loops. Originally this function was written in Lisp when the Lisp command loop was used, but it was too slow that way. Under the C command loop, this function will never return (although someone might throw past it). Under the Lisp command loop, this will return only when the user specifies a new command loop by changing the command-loop variable. */ #ifdef LISP_COMMAND_LOOP #define DEFUN_COMMAND_LOOP(a,b,c,d,e,f) DEFUN (a, b, c, d, e, f) #else #define DEFUN_COMMAND_LOOP(a,b,c,d,e,f) DEFUN_NORETURN (a, b, c, d, e, f) #endif DEFUN_COMMAND_LOOP ("command-loop-1", Fcommand_loop_1, 0, 0, 0, /* Invoke the internals of the canonical editor command loop. Don't call this unless you know what you're doing. */ ()) { /* This function can GC */ Lisp_Object event = Fmake_event (Qnil, Qnil); Lisp_Object old_loop = Qnil; struct gcpro gcpro1, gcpro2; int was_locked = in_single_console_state (); GCPRO2 (event, old_loop); /* cancel_echoing (); */ /* This magically makes single character keyboard macros work just like the real thing. This is slightly bogus, but it's in here for compatibility with Emacs 18. It's not even clear what the "right thing" is. */ if (!((STRINGP (Vexecuting_macro) || VECTORP (Vexecuting_macro)) && XINT (Flength (Vexecuting_macro)) == 1)) Vlast_command = Qt; #ifndef LISP_COMMAND_LOOP while (1) #else old_loop = Vcommand_loop; while (EQ (Vcommand_loop, old_loop)) #endif /* LISP_COMMAND_LOOP */ { /* If focus_follows_mouse, make sure the frame with window manager focus is selected. */ if (focus_follows_mouse) investigate_frame_change (); /* Make sure the current window's buffer is selected. */ { Lisp_Object selected_window = Fselected_window (Qnil); if (!NILP (selected_window) && XWINDOW_XBUFFER (selected_window) != current_buffer) { set_buffer_internal (XWINDOW_XBUFFER (selected_window)); } } #if 0 /* What's wrong with going through ordinary procedure of quit? quitting here leaves overriding-terminal-local-map when you type C-u C-u C-g. */ /* If ^G was typed before we got here (that is, before emacs was idle and waiting for input) then we treat that as an interrupt. */ QUIT; #endif /* If minibuffer on and echo area in use, wait 2 sec and redraw minibuffer. Treat a ^G here as a command, not an interrupt. */ if (minibuf_level > 0 && echo_area_active (selected_frame ())) { /* Bind dont_check_for_quit to 1 so that C-g gets read in rather than quitting back to the minibuffer. */ int count = begin_dont_check_for_quit (); if (!NILP (Vminibuffer_echo_wait_function)) call0 (Vminibuffer_echo_wait_function); else Fsit_for (make_int (2), Qnil); clear_echo_area (selected_frame (), Qnil, 0); Vquit_flag = Qnil; /* see begin_dont_check_for_quit() */ unbind_to (count); } Fnext_event (event, Qnil); Fdispatch_event (event); if (!was_locked) any_console_state (); DO_NOTHING_DISABLING_NO_RETURN_WARNINGS; } #ifdef LISP_COMMAND_LOOP UNGCPRO; return Qnil; #else RETURN_NOT_REACHED (Qnil); #endif } /**********************************************************************/ /* Initialization */ /**********************************************************************/ void syms_of_cmdloop (void) { DEFSYMBOL (Qdisabled_command_hook); DEFSYMBOL (Qcommand_error); DEFSYMBOL (Qreally_early_error_handler); DEFSYMBOL (Qtop_level); DEFSYMBOL (Qerrors_deactivate_region); #ifndef LISP_COMMAND_LOOP DEFSUBR (Frecursive_edit); #endif DEFSUBR (Freally_early_error_handler); DEFSUBR (Fcommand_loop_1); } void vars_of_cmdloop (void) { DEFVAR_INT ("command-loop-level", &command_loop_level /* Number of recursive edits in progress. */ ); command_loop_level = 0; DEFVAR_LISP ("disabled-command-hook", &Vdisabled_command_hook /* Value is called instead of any command that is disabled, i.e. has a non-nil `disabled' property. */ ); Vdisabled_command_hook = intern ("disabled-command-hook"); DEFVAR_LISP ("leave-window-hook", &Vleave_window_hook /* Not yet implemented. */ ); Vleave_window_hook = Qnil; DEFVAR_LISP ("enter-window-hook", &Venter_window_hook /* Not yet implemented. */ ); Venter_window_hook = Qnil; DEFVAR_LISP ("minibuffer-echo-wait-function", &Vminibuffer_echo_wait_function /* The function called by command loop when minibuffer was active and message was displayed (text appeared in \" *Echo Area*\" buffer). It must wait after displaying message so that user can read it. If the variable value is `nil', the equivalent of `(sit-for 2)' is run. */ ); Vminibuffer_echo_wait_function = Qnil; #ifndef LISP_COMMAND_LOOP DEFVAR_LISP ("top-level", &Vtop_level /* Form to evaluate when Emacs starts up. Useful to set before you dump a modified Emacs. */ ); Vtop_level = Qnil; #else DEFVAR_LISP ("command-loop", &Vcommand_loop /* Function or one argument to call to read and process keyboard commands. The passed argument specifies whether or not to handle errors. */ ); Vcommand_loop = Qnil; #endif /* LISP_COMMAND_LOOP */ }