Mercurial > hg > xemacs-beta
view etc/Emacs.ad @ 4677:8f1ee2d15784
Support full Common Lisp multiple values in C.
lisp/ChangeLog
2009-08-11 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el :
Update this file to support full C-level multiple values. This
involves:
-- Four new bytecodes, and special compiler functions to compile
multiple-value-call, multiple-value-list-internal, values,
values-list, and, since it now needs to pass back multiple values
and is a special form, throw.
-- There's a new compiler variable, byte-compile-checks-on-load,
which is a list of forms that are evaluated at the very start of a
file, with an error thrown if any of them give nil.
-- The header is now inserted *after* compilation, giving a chance
for the compilation process to influence what those checks
are. There is still a check done before compilation for non-ASCII
characters, to try to turn off dynamic docstrings if appopriate,
in `byte-compile-maybe-reset-coding'.
Space is reserved for checks; comments describing the version of
the byte compiler generating the file are inserted if space
remains for them.
* bytecomp.el (byte-compile-version):
Update this, we're a newer version of the byte compiler.
* byte-optimize.el (byte-optimize-funcall):
Correct a comment.
* bytecomp.el (byte-compile-lapcode):
Discard the arg with byte-multiple-value-call.
* bytecomp.el (byte-compile-checks-and-comments-space):
New variable, describe how many octets to reserve for checks at
the start of byte-compiled files.
* cl-compat.el:
Remove the fake multiple-value implementation. Have the functions
that use it use the real multiple-value implementation instead.
* cl-macs.el (cl-block-wrapper, cl-block-throw):
Revise the byte-compile properties of these symbols to work now
we've made throw into a special form; keep the byte-compile
properties as anonymous lambdas, since we don't have docstrings
for them.
* cl-macs.el (multiple-value-bind, multiple-value-setq)
(multiple-value-list, nth-value):
Update these functions to work with the C support for multiple
values.
* cl-macs.el (values):
Modify the setf handler for this to call
#'multiple-value-list-internal appropriately.
* cl-macs.el (cl-setf-do-store):
If the store form is a cons, treat it specially as wrapping the
store value.
* cl.el (cl-block-wrapper):
Make this an alias of #'and, not #'identity, since it needs to
pass back multiple values.
* cl.el (multiple-value-apply):
We no longer support this, mark it obsolete.
* lisp-mode.el (eval-interactive-verbose):
Remove a useless space in the docstring.
* lisp-mode.el (eval-interactive):
Update this function and its docstring. It now passes back a list,
basically wrapping any eval calls with multiple-value-list. This
allows multiple values to be printed by default in *scratch*.
* lisp-mode.el (prin1-list-as-multiple-values):
New function, printing a list as multiple values in the manner of
Bruno Haible's clisp, separating each entry with " ;\n".
* lisp-mode.el (eval-last-sexp):
Call #'prin1-list-as-multiple-values on the return value of
#'eval-interactive.
* lisp-mode.el (eval-defun):
Call #'prin1-list-as-multiple-values on the return value of
#'eval-interactive.
* mouse.el (mouse-eval-sexp):
Deal with lists corresponding to multiple values from
#'eval-interactive. Call #'cl-prettyprint, which is always
available, instead of sometimes calling #'pprint and sometimes
falling back to prin1.
* obsolete.el (obsolete-throw):
New function, called from eval.c when #'funcall encounters an
attempt to call #'throw (now a special form) as a function. Only
needed for compatibility with 21.4 byte-code.
man/ChangeLog addition:
2009-08-11 Aidan Kehoe <kehoea@parhasard.net>
* cl.texi (Organization):
Remove references to the obsolete multiple-value emulating code.
src/ChangeLog addition:
2009-08-11 Aidan Kehoe <kehoea@parhasard.net>
* bytecode.c (enum Opcode /* Byte codes */):
Add four new bytecodes, to deal with multiple values.
(POP_WITH_MULTIPLE_VALUES): New macro.
(POP): Modify this macro to ignore multiple values.
(DISCARD_PRESERVING_MULTIPLE_VALUES): New macro.
(DISCARD): Modify this macro to ignore multiple values.
(TOP_WITH_MULTIPLE_VALUES): New macro.
(TOP_ADDRESS): New macro.
(TOP): Modify this macro to ignore multiple values.
(TOP_LVALUE): New macro.
(Bcall): Ignore multiple values where appropriate.
(Breturn): Pass back multiple values.
(Bdup): Preserve multiple values.
Use TOP_LVALUE with most bytecodes that assign anything to
anything.
(Bbind_multiple_value_limits, Bmultiple_value_call,
Bmultiple_value_list_internal, Bthrow): Implement the new
bytecodes.
(Bgotoifnilelsepop, Bgotoifnonnilelsepop, BRgotoifnilelsepop,
BRgotoifnonnilelsepop):
Discard any multiple values.
* callint.c (Fcall_interactively):
Ignore multiple values when calling #'eval, in two places.
* device-x.c (x_IO_error_handler):
* macros.c (pop_kbd_macro_event):
* eval.c (Fsignal):
* eval.c (flagged_a_squirmer):
Call throw_or_bomb_out, not Fthrow, now that the latter is a
special form.
* eval.c:
Make Qthrow, Qobsolete_throw available as symbols.
Provide multiple_value_current_limit, multiple-values-limit (the
latter as specified by Common Lisp.
* eval.c (For):
Ignore multiple values when comparing with Qnil, but pass any
multiple values back for the last arg.
* eval.c (Fand):
Ditto.
* eval.c (Fif):
Ignore multiple values when examining the result of the
condition.
* eval.c (Fcond):
Ignore multiple values when comparing what the clauses give, but
pass them back if a clause gave non-nil.
* eval.c (Fprog2):
Never pass back multiple values.
* eval.c (FletX, Flet):
Ignore multiple when evaluating what exactly symbols should be
bound to.
* eval.c (Fwhile):
Ignore multiple values when evaluating the test.
* eval.c (Fsetq, Fdefvar, Fdefconst):
Ignore multiple values.
* eval.c (Fthrow):
Declare this as a special form; ignore multiple values for TAG,
preserve them for VALUE.
* eval.c (throw_or_bomb_out):
Make this available to other files, now Fthrow is a special form.
* eval.c (Feval):
Ignore multiple values when calling a compiled function, a
non-special-form subr, or a lambda expression.
* eval.c (Ffuncall):
If we attempt to call #'throw (now a special form) as a function,
don't error, call #'obsolete-throw instead.
* eval.c (make_multiple_value, multiple_value_aset)
(multiple_value_aref, print_multiple_value, mark_multiple_value)
(size_multiple_value):
Implement the multiple_value type. Add a long comment describing
our implementation.
* eval.c (bind_multiple_value_limits):
New function, used by the bytecode and by #'multiple-value-call,
#'multiple-value-list-internal.
* eval.c (multiple_value_call):
New function, used by the bytecode and #'multiple-value-call.
* eval.c (Fmultiple_value_call):
New special form.
* eval.c (multiple_value_list_internal):
New function, used by the byte code and
#'multiple-value-list-internal.
* eval.c (Fmultiple_value_list_internal, Fmultiple_value_prog1):
New special forms.
* eval.c (Fvalues, Fvalues_list):
New Lisp functions.
* eval.c (values2):
New function, for C code returning multiple values.
* eval.c (syms_of_eval):
Make our new Lisp functions and symbols available.
* eval.c (multiple-values-limit):
Make this available to Lisp.
* event-msw.c (dde_eval_string):
* event-stream.c (execute_help_form):
* glade.c (connector):
* glyphs-widget.c (glyph_instantiator_to_glyph):
* glyphs.c (evaluate_xpm_color_symbols):
* gui-x.c (wv_set_evalable_slot, button_item_to_widget_value):
* gui.c (gui_item_value, gui_item_display_flush_left):
* lread.c (check_if_suppressed):
* menubar-gtk.c (menu_convert, menu_descriptor_to_widget_1):
* menubar-msw.c (populate_menu_add_item):
* print.c (Fwith_output_to_temp_buffer):
* symbols.c (Fsetq_default):
Ignore multiple values when calling Feval.
* symeval.h:
Add the header declarations necessary for the multiple-values
implementation.
* inline.c:
#include symeval.h, now that it has some inline functions.
* lisp.h:
Update Fthrow's declaration. Make throw_or_bomb_out available to
all files.
* lrecord.h (enum lrecord_type):
Add the multiple_value type here.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Sun, 16 Aug 2009 20:55:49 +0100 |
| parents | 6355bae896e3 |
| children | ea7a6c12df45 |
line wrap: on
line source
! This is the app-defaults file for XEmacs. ! ! This used to be identical to sample.Xresources, but the resources ! below have been rewritten to be as general as possible to avoid ! overriding user resources. Other than the form rewriting, both ! files should be kept in sync. ! ! The resources below are loaded into the XEmacs executable at compile-time: ! changes to .../etc/Emacs.ad made after XEmacs has been built will have no ! effect. ! ! However, you may copy .../etc/Emacs.ad to /usr/lib/X11/app-defaults/Emacs ! (or whatever the standard app-defaults directory is at your site) to cause ! it to be consulted at run-time. (Do this only for site-wide customizations: ! personal customizations should be put into ~/.Xresources instead.) ! Note that the file must be named Emacs, not XEmacs. ! ! See the NEWS file (C-h n) or XEmacs manual (C-h i) for a description of ! the various resources and the syntax for setting them. ! Colors and backgrounds. ! ====================== ! The contrasts of these colors will cause them to map to the appropriate ! one of "black" or "white" on monochrome systems. ! ! The valid color names on your system can be found by looking in the file ! `rgb.txt', usually found in /usr/lib/X11/ or /usr/openwin/lib/X11/. ! Set the modeline colors. !Emacs.modeline*attributeForeground: Black !Emacs.modeline*attributeBackground: Gray75 ! Set the color of the text cursor. !Emacs.text-cursor*attributeBackground: Red3 ! If you want to set the color of the mouse pointer, do this: ! Emacs.pointer*attributeForeground: Black ! If you want to set the background of the mouse pointer, do this: ! Emacs.pointer*attributeBackground: White ! Note that by default, the pointer foreground and background are the same ! as the default face. ! Set the menubar colors. This overrides the default foreground and ! background colors specified above. *menubar*Foreground: Gray30 *menubar*Background: Gray80 ! This is for buttons in the menubar. ! Yellow would be better, but that would map to white on monochrome. *menubar*buttonForeground: Blue *XlwMenu*highlightForeground: Red *XlwMenu*titleForeground: Maroon *XlwMenu*selectColor: ForestGreen *XmToggleButton*selectColor: ForestGreen ! Specify the colors of popup menus. *popup*Foreground: Black *popup*Background: Gray80 ! Specify the colors of the various sub-widgets of the dialog boxes. *dialog*Foreground: Black ! #A5C0C1 is a shade of blue *dialog*Background: #A5C0C1 ! The following three are for Motif dialog boxes ... *dialog*XmTextField*Background: WhiteSmoke *dialog*XmText*Background: WhiteSmoke *dialog*XmList*Background: WhiteSmoke ! While this one is for Athena dialog boxes. *dialog*Command*Background: WhiteSmoke ! Xlw Scrollbar colors *XlwScrollBar*Foreground: Gray30 *XlwScrollBar*Background: Gray80 *XmScrollBar*Foreground: Gray30 *XmScrollBar*Background: Gray80 ! ! The Lucid Scrollbar supports two added resources, SliderStyle is either ! "plain" (default) or "dimple". Dimple puts a small dimple in the middle ! of the slider that depresses when the slider is clicked on. ArrowPosition is ! either "opposite" (default) or "same". Opposite puts the arrows at opposite ! of the scrollbar, same puts both arrows at the same end, like the Amiga. ! ! Emacs*XlwScrollBar.SliderStyle: dimple ! Emacs*XlwScrollBar.ArrowPosition: opposite ! ! If you want to turn off a toolbar, set its height or width to 0. ! The correct size value is not really arbitrary. We only control it ! this way in order to avoid excess frame resizing when turning the ! toolbars on and off. ! ! To change the heights and widths of the toolbars: ! ! Emacs.topToolBarHeight: 37 ! Emacs.bottomToolBarHeight: 0 ! Emacs.leftToolBarWidth: 0 ! Emacs.rightToolBarWidth: 0 !*topToolBarShadowColor: Gray90 !*bottomToolBarShadowColor: Gray40 !*backgroundToolBarColor: Gray80 *toolBarShadowThickness: 2 ! If you want to turn off vertical scrollbars, or change the default ! pixel width of the vertical scrollbars, do it like this (0 width ! means no vertical scrollbars): ! ! Emacs.scrollBarWidth: 0 ! ! To change it for a particular frame, do this: ! ! Emacs*FRAME-NAME.scrollBarWidth: 0 ! If you want to turn off horizontal scrollbars, or change the default ! pixel height of the horizontal scrollbars, do it like this (0 height ! means no horizontal scrollbars): ! ! Emacs.scrollBarHeight: 0 ! ! To change it for a particular frame, do this: ! ! Emacs*FRAME-NAME.scrollBarHeight: 0 ! To dynamically change the labels used for menubar buttons... ! ! Emacs*XlwMenu.resourceLabels: True ! Emacs*XlwMenu.newFrame.labelString: Open Another Window ! To have the Motif scrollbars on the left instead of the right, do this: ! ! Emacs*scrollBarPlacement: BOTTOM_LEFT ! ! To have the Athena scrollbars on the right, use `BOTTOM_RIGHT' instead ! To have Motif scrollbars act more like Xt scrollbars... ! ! Emacs*XmScrollBar.translations: #override \n\ ! <Btn1Down>: PageDownOrRight(0) \n\ ! <Btn3Down>: PageUpOrLeft(0) ! Fonts. ! ====== ! XEmacs requires the use of XLFD (X Logical Font Description) format font ! names, which look like ! ! *-courier-medium-r-*-*-*-120-*-*-*-*-*-* ! ! if you use any of the other, less strict font name formats, some of which ! look like ! lucidasanstypewriter-12 ! and fixed ! and 9x13 ! ! then XEmacs won't be able to guess the names of the bold and italic versions. ! All X fonts can be referred to via XLFD-style names, so you should use those ! forms. See the man pages for X(1), xlsfonts(1), and xfontsel(1). ! The default font for the text area of XEmacs is chosen at run-time ! by lisp code which tries a number of different possibilities in order ! of preference. If you wish to override it, use this: ! ! Emacs.default.attributeFont: -*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-* ! If you choose a font which does not have an italic version, you can specify ! some other font to use for it here: ! ! Emacs.italic.attributeFont: -*-courier-medium-o-*-*-*-120-*-*-*-*-iso8859-* ! ! If you choose a font which does not have a bold-italic version, ! you can specify some other font to use for it here: ! ! Emacs.bold-italic.attributeFont: -*-courier-bold-o-*-*-*-120-*-*-*-*-iso8859-* ! ! And here is how you would set the background color of the `highlight' face, ! but only on the screen named `debugger': ! ! Emacs*debugger.highlight.attributeBackground: PaleTurquoise ! ! See the NEWS file (C-h n) for a more complete description of the resource ! syntax of faces. ! Font of the modeline, menubar and pop-up menus. ! Note that the menubar resources do not use the `face' syntax, since they ! are X toolkit widgets and thus outside the domain of XEmacs proper. ! ! When X Font Sets are enabled with ./configure --with-xfs (eg, for ! multilingual menubars and XIM), some .font resources (those specific to ! the Lucid widget set) are ignored in favor of .fontSet resources. This ! example shows how to add fonts for Japanese menubars: ! ! *menubar*FontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \ ! -*-*-*-*-*-*-*-120-*-jisx0208.1983-0 ! *menubar*Font: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-* *popup*Font: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-* *menubar*FontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \ -*-*-*-*-*-*-*-120-*-iso10646-1, \ -*-*-*-*-*-*-*-120-*-jisx0208.1983-0, \ -*-*-*-*-*-*-*-120-*-jisx0201.1976-0 *popup*FontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \ -*-*-*-*-*-*-*-120-*-iso10646-1, \ -*-*-*-*-*-*-*-120-*-jisx0208.1983-0, \ -*-*-*-*-*-*-*-120-*-jisx0201.1976-0 ! Gui elements share this font ! Emacs.gui-element.attributeFont: -*-helvetica-medium-r-*-*-*-120-*-*-*-*-iso8859-* ! Font in the Motif dialog boxes. ! (Motif uses `fontList' while most other things use `font' - if you don't ! know why you probably don't want to.) ! *XmDialogShell*FontList: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-* *XmTextField*FontList: -*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-* *XmText*FontList: -*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-* *XmList*FontList: -*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-* ! Font in the Athena dialog boxes. ! I think 14-point looks nicer than 12-point. ! Some people use 12-point anyway because you get more text, but ! there's no purpose at all in doing this for dialog boxes. *Dialog*Font: -*-helvetica-bold-r-*-*-*-140-*-*-*-*-iso8859-* ! Dialog box translations. ! ======================= ! This accelerator binds <return> in a dialog box to <activate> on button1 *dialog*button1.accelerators:#override\ <KeyPress>Return: ArmAndActivate()\n\ <KeyPress>KP_Enter: ArmAndActivate()\n\ Ctrl<KeyPress>m: ArmAndActivate()\n ! Translations to make the TextField widget behave more like XEmacs *XmTextField*translations: #override\n\ !<Key>osfBackSpace: delete-previous-character()\n\ !<Key>osfDelete: delete-previous-character()\n\ !Ctrl<Key>h: delete-previous-character()\n\ !Ctrl<Key>d: delete-next-character()\n\ !Meta<Key>osfDelete: delete-previous-word()\n\ !Meta<Key>osfBackSpace: delete-previous-word()\n\ !Meta<Key>d: delete-next-word()\n\ !Ctrl<Key>k: delete-to-end-of-line()\n\ !Ctrl<Key>g: process-cancel()\n\ !Ctrl<Key>b: backward-character()\n\ !<Key>osfLeft: backward-character()\n\ !Ctrl<Key>f: forward-character()\n\ !<Key>osfRight: forward-character()\n\ !Meta<Key>b: backward-word()\n\ !Meta<Key>osfLeft: backward-word()\n\ !Meta<Key>f: forward-word()\n\ !Meta<Key>osfRight: forward-word()\n\ !Ctrl<Key>e: end-of-line()\n\ !Ctrl<Key>a: beginning-of-line()\n\ !Ctrl<Key>w: cut-clipboard()\n\ !Meta<Key>w: copy-clipboard()\n\ <Btn2Up>: copy-primary()\n ! With the XEmacs typeahead it's better to not have space be bound to ! ArmAndActivate() for buttons that appear in dialog boxes. This is ! not 100% Motif compliant but the benefits far outweight the ! compliancy problem. *dialog*XmPushButton*translations:#override\n\ <Btn1Down>: Arm()\n\ <Btn1Down>,<Btn1Up>: Activate()\ Disarm()\n\ <Btn1Down>(2+): MultiArm()\n\ <Btn1Up>(2+): MultiActivate()\n\ <Btn1Up>: Activate()\ Disarm()\n\ <Key>osfSelect: ArmAndActivate()\n\ <Key>osfActivate: ArmAndActivate()\n\ <Key>osfHelp: Help()\n\ ~Shift ~Meta ~Alt <Key>Return: ArmAndActivate()\n\ <EnterWindow>: Enter()\n\ <LeaveWindow>: Leave()\n ! Native Widget translations ! ======================= Emacs*Text*translations: #override\n\ <Btn1Down>: widget-focus-in() select-start()\n ! XIM input method style ! ======================= ! ximStyles is a (whitespace or comma-separated) list of XIMStyles in ! order of user's preference. ! Choose a subset of the following styles or reorder to taste *ximStyles: XIMPreeditPosition|XIMStatusArea\ XIMPreeditPosition|XIMStatusNothing\ XIMPreeditPosition|XIMStatusNone\ XIMPreeditNothing|XIMStatusArea\ XIMPreeditNothing|XIMStatusNothing\ XIMPreeditNothing|XIMStatusNone\ XIMPreeditNone|XIMStatusArea\ XIMPreeditNone|XIMStatusNothing\ XIMPreeditNone|XIMStatusNone ! XIM Preedit and Status foreground and background *EmacsFrame.ximForeground: black *EmacsFrame.ximBackground: white ! XIM fontset (defaults to system fontset default) ! *EmacsFrame.FontSet: -dt-interface user-medium-r-normal-s*-*-*-*-*-*-*-*-*