Mercurial > hg > xemacs-beta
annotate lisp/text-mode.el @ 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 | 3ecd8885ac67 |
children | 308d34e9f07d |
rev | line source |
---|---|
428 | 1 ;;; text-mode.el --- text mode, and its idiosyncratic commands. |
2 | |
3 ;; Copyright (C) 1985, 1992, 1994, 1997 Free Software Foundation, Inc. | |
4 | |
5 ;; Maintainer: FSF | |
6 ;; Keywords: wp, dumped | |
7 | |
8 ;; This file is part of XEmacs. | |
9 | |
10 ;; XEmacs is free software; you can redistribute it and/or modify it | |
11 ;; under the terms of the GNU General Public License as published by | |
12 ;; the Free Software Foundation; either version 2, or (at your option) | |
13 ;; any later version. | |
14 | |
15 ;; XEmacs is distributed in the hope that it will be useful, but | |
16 ;; WITHOUT ANY WARRANTY; without even the implied warranty of | |
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
18 ;; General Public License for more details. | |
19 | |
20 ;; You should have received a copy of the GNU General Public License | |
21 ;; along with XEmacs; see the file COPYING. If not, write to the Free | |
22 ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA | |
23 ;; 02111-1307, USA. | |
24 | |
25 ;;; Synched up with: FSF 20.2. | |
26 | |
27 ;;; Commentary: | |
28 | |
29 ;; This file is dumped with XEmacs. | |
30 | |
31 ;; This package provides the fundamental text mode documented in the | |
32 ;; Emacs user's manual. | |
33 | |
34 ;;; Code: | |
35 | |
36 (defvar text-mode-hook nil | |
37 "Normal hook run when entering Text mode and many related modes.") | |
38 | |
39 (defvar text-mode-variant nil | |
40 "Non-nil if this buffer's major mode is a variant of Text mode.") | |
41 | |
42 (defvar text-mode-syntax-table nil | |
43 "Syntax table used while in text mode.") | |
44 | |
45 (defvar text-mode-abbrev-table nil | |
46 "Abbrev table used while in text mode.") | |
47 (define-abbrev-table 'text-mode-abbrev-table ()) | |
48 | |
49 (if text-mode-syntax-table | |
50 () | |
51 (setq text-mode-syntax-table (make-syntax-table)) | |
52 (modify-syntax-entry ?\" ". " text-mode-syntax-table) | |
53 (modify-syntax-entry ?\\ ". " text-mode-syntax-table) | |
54 (modify-syntax-entry ?' "w " text-mode-syntax-table)) | |
55 | |
56 (defvar text-mode-map nil | |
57 "Keymap for Text mode. | |
58 Many other modes, such as Mail mode, Outline mode and Indented Text mode, | |
59 inherit all the commands defined in this map.") | |
60 | |
61 (if text-mode-map | |
62 () | |
63 (setq text-mode-map (make-sparse-keymap)) | |
64 ;; XEmacs change | |
65 (set-keymap-name text-mode-map 'text-mode-map) | |
66 (define-key text-mode-map "\e\t" 'ispell-complete-word) | |
67 (define-key text-mode-map "\t" 'indent-relative) | |
68 (define-key text-mode-map "\es" 'center-line) | |
69 (define-key text-mode-map "\eS" 'center-paragraph)) | |
70 | |
71 | |
72 (defun text-mode () | |
73 "Major mode for editing text written for humans to read. | |
74 In this mode, paragraphs are delimited only by blank or white lines. | |
75 You can thus get the full benefit of adaptive filling | |
76 (see the variable `adaptive-fill-mode'). | |
77 \\{text-mode-map} | |
78 Turning on Text mode runs the normal hook `text-mode-hook'." | |
79 (interactive) | |
80 (kill-all-local-variables) | |
81 (use-local-map text-mode-map) | |
82 (setq local-abbrev-table text-mode-abbrev-table) | |
83 (set-syntax-table text-mode-syntax-table) | |
84 (make-local-variable 'paragraph-start) | |
85 (setq paragraph-start (concat page-delimiter "\\|[ \t]*$")) | |
86 (make-local-variable 'paragraph-separate) | |
87 (setq paragraph-separate paragraph-start) | |
88 (setq mode-name "Text") | |
89 (setq major-mode 'text-mode) | |
90 (run-hooks 'text-mode-hook)) | |
91 | |
92 (defun paragraph-indent-text-mode () | |
93 "Major mode for editing text, with leading spaces starting a paragraph. | |
94 In this mode, you do not need blank lines between paragraphs | |
95 when the first line of the following paragraph starts with whitespace. | |
96 Special commands: | |
97 \\{text-mode-map} | |
98 Turning on Paragraph-Indent Text mode runs the normal hooks | |
99 `text-mode-hook' and `paragraph-indent-text-mode-hook'." | |
100 (interactive) | |
101 (kill-all-local-variables) | |
102 (use-local-map text-mode-map) | |
103 (setq mode-name "Parindent") | |
104 (setq major-mode 'paragraph-indent-text-mode) | |
105 (setq local-abbrev-table text-mode-abbrev-table) | |
106 (set-syntax-table text-mode-syntax-table) | |
107 (run-hooks 'text-mode-hook 'paragraph-indent-text-mode-hook)) | |
108 | |
109 (defalias 'indented-text-mode 'text-mode) | |
110 | |
111 (defun text-mode-hook-identify () | |
112 "Mark that this mode has run `text-mode-hook'. | |
113 This is how `toggle-text-mode-auto-fill' knows which buffers to operate on." | |
114 (make-local-variable 'text-mode-variant) | |
115 (setq text-mode-variant t)) | |
116 | |
117 (add-hook 'text-mode-hook 'text-mode-hook-identify) | |
118 | |
119 (defun toggle-text-mode-auto-fill () | |
120 "Toggle whether to use Auto Fill in Text mode and related modes. | |
121 This command affects all buffers that use modes related to Text mode, | |
122 both existing buffers and buffers that you subsequently create." | |
123 (interactive) | |
124 (let ((enable-mode (not (memq 'turn-on-auto-fill text-mode-hook))) | |
125 (buffers (buffer-list))) | |
126 (if enable-mode | |
127 (add-hook 'text-mode-hook 'turn-on-auto-fill) | |
128 (remove-hook 'text-mode-hook 'turn-on-auto-fill)) | |
129 (while buffers | |
130 (with-current-buffer (car buffers) | |
131 (if text-mode-variant | |
132 (auto-fill-mode (if enable-mode 1 0)))) | |
133 (setq buffers (cdr buffers))) | |
134 (message "Auto Fill %s in Text modes" | |
135 (if enable-mode "enabled" "disabled")))) | |
136 | |
137 (defun center-paragraph () | |
138 "Center each nonblank line in the paragraph at or after point. | |
139 See `center-line' for more info." | |
140 (interactive) | |
141 (save-excursion | |
142 (forward-paragraph) | |
143 (or (bolp) (newline 1)) | |
144 (let ((end (point))) | |
145 (backward-paragraph) | |
146 (center-region (point) end)))) | |
147 | |
148 (defun center-region (from to) | |
149 "Center each nonblank line starting in the region. | |
150 See `center-line' for more info." | |
151 (interactive "r") | |
152 (if (> from to) | |
153 (let ((tem to)) | |
154 (setq to from from tem))) | |
155 (save-excursion | |
156 (save-restriction | |
157 (narrow-to-region from to) | |
158 (goto-char from) | |
159 (while (not (eobp)) | |
160 (or (save-excursion (skip-chars-forward " \t") (eolp)) | |
161 (center-line)) | |
162 (forward-line 1))))) | |
163 | |
164 (defun center-line (&optional nlines) | |
165 "Center the line point is on, within the width specified by `fill-column'. | |
166 This means adjusting the indentation so that it equals | |
167 the distance between the end of the text and `fill-column'. | |
168 The argument NLINES says how many lines to center." | |
169 (interactive "P") | |
170 (if nlines (setq nlines (prefix-numeric-value nlines))) | |
171 (while (not (eq nlines 0)) | |
172 (save-excursion | |
173 (let ((lm (current-left-margin)) | |
174 line-length) | |
175 (beginning-of-line) | |
176 (delete-horizontal-space) | |
177 (end-of-line) | |
178 (delete-horizontal-space) | |
179 (setq line-length (current-column)) | |
180 (if (> (- fill-column lm line-length) 0) | |
181 (indent-line-to | |
182 (+ lm (/ (- fill-column lm line-length) 2)))))) | |
183 (cond ((null nlines) | |
184 (setq nlines 0)) | |
185 ((> nlines 0) | |
186 (setq nlines (1- nlines)) | |
187 (forward-line 1)) | |
188 ((< nlines 0) | |
189 (setq nlines (1+ nlines)) | |
190 (forward-line -1))))) | |
191 | |
192 ;;; text-mode.el ends here |