Mercurial > hg > xemacs-beta
annotate src/dialog.c @ 5803:b79e1e02bf01
Preserve extent information in the command builder code.
src/ChangeLog addition:
2014-07-14 Aidan Kehoe <kehoea@parhasard.net>
* event-stream.c:
* event-stream.c (mark_command_builder):
* event-stream.c (finalize_command_builder): Removed.
* event-stream.c (allocate_command_builder):
* event-stream.c (free_command_builder): Removed. Use
free_normal_lisp_object() instead.
* event-stream.c (echo_key_event):
* event-stream.c (regenerate_echo_keys_from_this_command_keys):
Detach all extents here.
* event-stream.c (maybe_echo_keys):
* event-stream.c (reset_key_echo):
* event-stream.c (execute_help_form):
* event-stream.c (Fnext_event):
* event-stream.c (command_builder_find_leaf_no_jit_binding):
* event-stream.c (command_builder_find_leaf):
* event-stream.c (lookup_command_event):
* events.h (struct command_builder):
Move the command builder's echo_buf to being a Lisp string rather
than a malloced Ibyte array. This allows passing through extent
information, which was previously dropped. It also simplifies the
allocation and release code for the command builder.
Rename echo_buf_index to echo_buf_fill_pointer, better reflecting
its function.
Don't rely on zero-termination (something not particularly
compatible with Lisp-level code) when showing a substring of
echo_buf that differs from that designated by
echo_buf_fill_pointer, keep a separate counter instead and use
that.
* minibuf.c:
* minibuf.c (echo_area_append):
Use the new START and END keyword arguments to #'append-message,
rather than consing a new string for basically every #'next-event
prompt displayed.
test/ChangeLog addition:
2014-07-14 Aidan Kehoe <kehoea@parhasard.net>
* automated/extent-tests.el:
Check that extent information is passed through to the echo area
correctly with #'next-event's PROMPT argument.
lisp/ChangeLog addition:
2014-07-14 Aidan Kehoe <kehoea@parhasard.net>
* simple.el (raw-append-message):
Use #'write-sequence in this, take its START and END keyword
arguments, so our callers don't have to cons as much.
* simple.el (append-message):
Pass through START and END here.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Mon, 14 Jul 2014 13:42:42 +0100 |
| parents | 308d34e9f07d |
| children |
| rev | line source |
|---|---|
| 428 | 1 /* Implements elisp-programmable dialog boxes -- generic. |
| 2 Copyright (C) 1993, 1994 Free Software Foundation, Inc. | |
| 3 Copyright (C) 1995 Tinker Systems and INS Engineering Corp. | |
| 442 | 4 Copyright (C) 2000 Ben Wing. |
| 428 | 5 |
| 6 This file is part of XEmacs. | |
| 7 | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
872
diff
changeset
|
8 XEmacs is free software: you can redistribute it and/or modify it |
| 428 | 9 under the terms of the GNU General Public License as published by the |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
872
diff
changeset
|
10 Free Software Foundation, either version 3 of the License, or (at your |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
872
diff
changeset
|
11 option) any later version. |
| 428 | 12 |
| 13 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 16 for more details. | |
| 17 | |
| 18 You should have received a copy of the GNU General Public License | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
872
diff
changeset
|
19 along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 428 | 20 |
| 21 /* Synched up with: Not in FSF. */ | |
| 22 | |
| 23 #include <config.h> | |
| 24 #include "lisp.h" | |
| 442 | 25 |
| 872 | 26 #include "frame-impl.h" |
| 428 | 27 |
| 442 | 28 Lisp_Object Vdelete_dialog_box_hook; |
| 29 Lisp_Object Qdelete_dialog_box_hook; | |
| 428 | 30 |
| 442 | 31 DEFUN ("make-dialog-box-internal", Fmake_dialog_box_internal, 2, 2, 0, /* |
| 32 Internal helper function for `make-dialog-box'. | |
| 33 This handles all dialog-box types except `general'. | |
| 34 TYPE is the same as the first argument to `make-dialog-box', and KEYS | |
| 35 a list of the remaining arguments. | |
| 428 | 36 */ |
| 442 | 37 (type, keys)) |
| 428 | 38 { |
| 39 struct frame *f = selected_frame (); | |
| 40 | |
| 442 | 41 CHECK_SYMBOL (type); |
| 428 | 42 |
| 872 | 43 if (!HAS_FRAMEMETH_P (f, make_dialog_box_internal)) |
| 563 | 44 signal_error (Qunimplemented, |
| 872 | 45 "Device does not support dialogs", FRAME_DEVICE (f)); |
| 428 | 46 |
| 872 | 47 return FRAMEMETH (f, make_dialog_box_internal, (f, type, keys)); |
| 428 | 48 } |
| 49 | |
| 50 void | |
| 51 syms_of_dialog (void) | |
| 52 { | |
| 442 | 53 DEFSUBR (Fmake_dialog_box_internal); |
| 54 | |
| 55 DEFSYMBOL (Qdelete_dialog_box_hook); | |
| 428 | 56 } |
| 57 | |
| 58 void | |
| 59 vars_of_dialog (void) | |
| 60 { | |
| 61 Fprovide (intern ("dialog")); | |
| 442 | 62 |
| 63 DEFVAR_LISP ("delete-dialog-box-hook", &Vdelete_dialog_box_hook /* | |
| 64 Function or functions to call when a dialog box is about to be deleted. | |
| 65 One arg, the dialog box id. | |
| 66 */ ); | |
| 67 Vdelete_dialog_box_hook = Qnil; | |
| 428 | 68 } |