Mercurial > hg > xemacs-beta
view src/commands.h @ 4686:cdabd56ce1b5
Fix various small issues with the multiple-value implementation.
lisp/ChangeLog addition:
2009-08-31 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (byte-optimize-form-code-walker):
Be careful about discarding multiple values when optimising
#'prog1 calls.
(byte-optimize-or):
Preserve any trailing nil, as this is a supported way to
explicitly discard multiple values.
(byte-optimize-cond-1):
Discard multiple values with a singleton followed by no more
clauses.
* bytecomp.el (progn):
(prog1):
(prog2):
Be careful about discarding multiple values in the byte-hunk
handler of these three forms.
* bytecomp.el (byte-compile-prog1, byte-compile-prog2):
Don't call #'values explicitly, use `(or ,(pop form) nil) instead,
since that compiles to bytecode, not a funcall.
* bytecomp.el (byte-compile-values):
With one non-const argument, byte-compile to `(or ,(second form)
nil), not an explicit #'values call.
* bytecomp.el (byte-compile-insert-header):
Be nicer in the error message to emacs versions that don't
understand our bytecode.
src/ChangeLog addition:
2009-08-31 Aidan Kehoe <kehoea@parhasard.net>
* eval.c (For, Fand):
Don't declare val as REGISTER in these functions, for some reason
it breaks the non-DEBUG union build. These functions are only
called from interpreted code, the performance implication doesn't
matter. Thank you Robert Delius Royar!
* eval.c (Fmultiple_value_list_internal):
Error on too many arguments.
tests/ChangeLog addition:
2009-08-31 Aidan Kehoe <kehoea@parhasard.net>
* automated/lisp-tests.el (Assert-rounding):
Remove an overly-verbose failure message here.
Correct a couple of tests which were buggy in themselves. Add
three new tests, checking the behaviour of #'or and #'and when
passed zero arguments, and a Known-Bug-Expect-Failure call
involving letf and values. (The bug predates the C-level
multiple-value implementation.)
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sun, 06 Sep 2009 19:36:02 +0100 |
parents | 61855263cb07 |
children | 308d34e9f07d |
line wrap: on
line source
/* Definitions needed by most editing commands. Copyright (C) 1985-1994 Free Software Foundation, Inc. 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: FSF 19.30. */ #ifndef INCLUDED_commands_h_ #define INCLUDED_commands_h_ #if 0 /* FSFmacs */ #define Ctl(c) ((c)&037) #endif /* bunches of FSF keymap and minibuffer stuff not here (in Lisp) */ extern Lisp_Object Vlast_command_event; extern Lisp_Object Vlast_input_event; /* These next two for compatibility; they are V... because they can be nil. (Many FSFmacs equivalent variables incorrectly omit the V even though they are Lisp_Objects.) */ /* Last character of last key sequence. */ extern Lisp_Object Vlast_command_char; extern Lisp_Object Vlast_input_char; #if 0 /* FSFmacs */ /* Last input character read as a command, not counting menus reached by the mouse. */ extern Lisp_Object Vlast_nonmenu_event; #endif #if 0 /* Local to event-stream.c */ /* List of command events to be re-read, or Qnil. */ extern Lisp_Object Vunread_command_events; #endif #if 0 /* FSFmacs */ /* Command char event to be re-read, or -1 if none. Setting this is obsolete, but some things should still check it. */ extern int unread_command_char; #endif /* Last command executed by the editor command loop, not counting commands that set the prefix argument. */ extern Lisp_Object Vlast_command; /* The command being executed by the command loop. Commands may set this, and the value set will be copied into Vlast_command instead of the actual command. */ extern Lisp_Object Vthis_command; #if 0 /* FSFmacs */ /* If not Qnil, this is a switch-frame event which we decided to put off until the end of a key sequence. This should be read as the next command input, after any Vunread_command_events. read_key_sequence uses this to delay switch-frame events until the end of the key sequence; Fread_char uses it to put off switch-frame events until a non-ASCII event is acceptable as input. */ extern Lisp_Object unread_switch_frame; #endif #if 0 /* Local to event-stream.c */ /* The value of point when the last command was executed. */ extern int last_point_position; /* The buffer that was current when the last command was started. */ extern Lisp_Object last_point_position_buffer; #endif /* This is so incredibly losing that it's been completely eliminated from the code. Trust me, there are cleaner, safer ways of achieving the same functionality (e.g. use select()). */ /* extern int immediate_quit; Nonzero means ^G can quit instantly */ /* Nonzero if input is coming from the keyboard */ #define INTERACTIVE (NILP (Vexecuting_macro) && !noninteractive) /* Set this nonzero to force reconsideration of modeline. */ extern int modeline_changed; extern Lisp_Object recent_keys_ring; extern int recent_keys_ring_index; /* #ifndef LISP_COMMAND_LOOP */ extern Lisp_Object Vtop_level; /* #else */ extern Lisp_Object Vcommand_loop; /* #endif */ DECLARE_DOESNT_RETURN (initial_command_loop (Lisp_Object)); DECLARE_DOESNT_RETURN_TYPE (Lisp_Object, call_command_loop (Lisp_Object catch_errors)); extern Fixnum command_loop_level; extern Lisp_Object Vkeyboard_translate_table; extern Lisp_Object Vlast_input_time; extern Lisp_Object Vcurrent_mouse_event; extern int zmacs_regions; extern int zmacs_region_active_p; extern int zmacs_region_stays; void zmacs_update_region (void); void zmacs_deactivate_region (void); Lisp_Object zmacs_region_buffer (void); extern Lisp_Object Vthis_command_keys; /* event-stream.c */ #endif /* INCLUDED_commands_h_ */