Mercurial > hg > xemacs-beta
annotate src/EmacsShellP.h @ 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 |
|---|---|
| 0 | 1 /* Emacs shell widget internal header file. |
| 2 Copyright (C) 1994, 1995 Sun Microsystems, Inc. | |
| 3 | |
| 4 This file is part of XEmacs. | |
| 5 | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
398
diff
changeset
|
6 XEmacs is free software: you can redistribute it and/or modify it |
| 0 | 7 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:
398
diff
changeset
|
8 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:
398
diff
changeset
|
9 option) any later version. |
| 0 | 10 |
| 11 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 12 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 13 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 14 for more details. | |
| 15 | |
| 16 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:
398
diff
changeset
|
17 along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 0 | 18 |
| 19 /* Synched up with: Not in FSF. */ | |
| 20 | |
| 21 /* Written by Ben Wing, May, 1994. */ | |
| 22 | |
| 398 | 23 #ifndef INCLUDED_EmacsShellP_h_ |
| 24 #define INCLUDED_EmacsShellP_h_ | |
| 0 | 25 |
| 26 #include "xintrinsic.h" | |
| 27 #include <X11/ShellP.h> | |
| 28 #include "EmacsShell.h" | |
| 29 | |
| 30 /****** TopLevelEmacsShell ******/ | |
| 31 | |
| 32 typedef struct { /* new fields for TopLevelEmacsShell class */ | |
| 33 int dummy; | |
| 34 } TopLevelEmacsShellClassPart; | |
| 35 | |
| 36 /* full class record declaration */ | |
| 37 typedef struct _TopLevelEmacsShellClassRec { | |
| 38 CoreClassPart core_class; | |
| 39 CompositeClassPart composite_class; | |
| 40 ShellClassPart shell_class; | |
| 41 WMShellClassPart wm_shell_class; | |
| 42 VendorShellClassPart vendor_shell_class; | |
| 43 TopLevelShellClassPart top_level_shell_class; | |
| 44 TopLevelEmacsShellClassPart emacs_shell_class; | |
| 45 } TopLevelEmacsShellClassRec; | |
| 46 | |
| 47 typedef struct { /* new fields for TopLevelEmacsShell widget */ | |
| 48 int width_cells, height_cells; | |
| 49 int min_width_cells, min_height_cells; | |
| 50 } TopLevelEmacsShellPart; | |
| 51 | |
| 52 typedef struct _TopLevelEmacsShellRec { /* full instance record */ | |
| 53 CorePart core; | |
| 54 CompositePart composite; | |
| 55 ShellPart shell; | |
| 56 WMShellPart wm; | |
| 57 VendorShellPart vendor; | |
| 58 TopLevelShellPart top_level; | |
| 59 TopLevelEmacsShellPart emacs_shell; | |
| 60 } TopLevelEmacsShellRec; | |
| 61 | |
| 62 /* class pointer */ | |
| 63 extern TopLevelEmacsShellClassRec topLevelEmacsShellClassRec; | |
| 64 | |
| 65 /****** TransientEmacsShell ******/ | |
| 66 | |
| 67 typedef struct { /* new fields for TransientEmacsShell class */ | |
| 68 int dummy; | |
| 69 } TransientEmacsShellClassPart; | |
| 70 | |
| 71 /* full class record declaration */ | |
| 72 typedef struct _TransientEmacsShellClassRec { | |
| 73 CoreClassPart core_class; | |
| 74 CompositeClassPart composite_class; | |
| 75 ShellClassPart shell_class; | |
| 76 WMShellClassPart wm_shell_class; | |
| 77 VendorShellClassPart vendor_shell_class; | |
| 78 TransientShellClassPart transient_shell_class; | |
| 79 TransientEmacsShellClassPart emacs_shell_class; | |
| 80 } TransientEmacsShellClassRec; | |
| 81 | |
| 82 typedef struct { /* new fields for TransientEmacsShell widget */ | |
| 83 int width_cells, height_cells; | |
| 84 int min_width_cells, min_height_cells; | |
| 85 } TransientEmacsShellPart; | |
| 86 | |
| 87 typedef struct _TransientEmacsShellRec { /* full instance record */ | |
| 88 CorePart core; | |
| 89 CompositePart composite; | |
| 90 ShellPart shell; | |
| 91 WMShellPart wm; | |
| 92 VendorShellPart vendor; | |
| 93 TransientShellPart transient; | |
| 94 TransientEmacsShellPart emacs_shell; | |
| 95 } TransientEmacsShellRec; | |
| 96 | |
| 97 /* class pointer */ | |
| 98 extern TransientEmacsShellClassRec transientEmacsShellClassRec; | |
| 99 | |
| 398 | 100 #endif /* INCLUDED_EmacsShellP_h_ */ |