annotate lib-src/ad2c @ 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 b9167d522a9a
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1 #!/bin/sh
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2 #
5287
cd167465bf69 More permission consistency.
Stephen J. Turnbull <stephen@xemacs.org>
parents: 5231
diff changeset
3 # Copyright (C) 1990, 1991 George Ferguson
cd167465bf69 More permission consistency.
Stephen J. Turnbull <stephen@xemacs.org>
parents: 5231
diff changeset
4 # Copyright (C) 1992 Charles Hannum
cd167465bf69 More permission consistency.
Stephen J. Turnbull <stephen@xemacs.org>
parents: 5231
diff changeset
5 # Copyright (C) 1992 Matthew Stier
cd167465bf69 More permission consistency.
Stephen J. Turnbull <stephen@xemacs.org>
parents: 5231
diff changeset
6 #
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7 # ad2c : Convert app-defaults file to C strings decls.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8 #
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
9 # George Ferguson, ferguson@cs.rcohester.edu, 12 Nov 1990.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
10 # 19 Mar 1991 : gf
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
11 # Made it self-contained.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
12 # 6 Jan 1992 : mycroft@gnu.ai.mit.edu (Charles Hannum)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
13 # Removed use of "-n" and ":read" label since Gnu and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
14 # IBM sed print pattern space on "n" command. Still works
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
15 # with Sun sed, of course.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
16 # 7 Jan 1992: matthew@sunpix.East.Sun.COM (Matthew Stier)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
17 # Escape quotes after escaping backslashes.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
18 #
4774
26a007fa2f4c Add GPL v2 or later notice to lib-src/ad2c with George Ferguson's permission.
Jerry James <james@xemacs.org>
parents: 0
diff changeset
19 # This file is part of XEmacs.
5406
061f4f90f874 Convert lib-src/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents: 5231
diff changeset
20 #
061f4f90f874 Convert lib-src/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents: 5231
diff changeset
21 # XEmacs is free software: you can redistribute it and/or modify it
4774
26a007fa2f4c Add GPL v2 or later notice to lib-src/ad2c with George Ferguson's permission.
Jerry James <james@xemacs.org>
parents: 0
diff changeset
22 # under the terms of the GNU General Public License as published by the
5406
061f4f90f874 Convert lib-src/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents: 5231
diff changeset
23 # Free Software Foundation, either version 3 of the License, or (at your
061f4f90f874 Convert lib-src/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents: 5231
diff changeset
24 # option) any later version.
061f4f90f874 Convert lib-src/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents: 5231
diff changeset
25 #
4774
26a007fa2f4c Add GPL v2 or later notice to lib-src/ad2c with George Ferguson's permission.
Jerry James <james@xemacs.org>
parents: 0
diff changeset
26 # XEmacs is distributed in the hope that it will be useful, but WITHOUT
26a007fa2f4c Add GPL v2 or later notice to lib-src/ad2c with George Ferguson's permission.
Jerry James <james@xemacs.org>
parents: 0
diff changeset
27 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
26a007fa2f4c Add GPL v2 or later notice to lib-src/ad2c with George Ferguson's permission.
Jerry James <james@xemacs.org>
parents: 0
diff changeset
28 # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
26a007fa2f4c Add GPL v2 or later notice to lib-src/ad2c with George Ferguson's permission.
Jerry James <james@xemacs.org>
parents: 0
diff changeset
29 # for more details.
5406
061f4f90f874 Convert lib-src/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents: 5231
diff changeset
30 #
4774
26a007fa2f4c Add GPL v2 or later notice to lib-src/ad2c with George Ferguson's permission.
Jerry James <james@xemacs.org>
parents: 0
diff changeset
31 # You should have received a copy of the GNU General Public License
5406
061f4f90f874 Convert lib-src/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents: 5231
diff changeset
32 # along with XEmacs. If not, see <http://www.gnu.org/licenses/>.
4774
26a007fa2f4c Add GPL v2 or later notice to lib-src/ad2c with George Ferguson's permission.
Jerry James <james@xemacs.org>
parents: 0
diff changeset
33 #
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
34 # Synched up with: Not in FSF.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
35
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
36 sed '
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
37 /^!/d
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
38 /^$/d
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
39 s/\\/\\\\/g
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
40 s/\\$//g
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
41 s/"/\\"/g
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
42 s/^/"/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
43 : test
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
44 /\\$/b slash
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
45 s/$/",/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
46 p
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
47 d
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
48 : slash
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
49 n
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
50 /^!/d
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
51 /^$/d
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
52 s/"/\\"/g
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
53 s/\\\\/\\/g
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
54 s/\\n/\\\\n/g
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
55 s/\\t/\\\\t/g
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
56 s/\\f/\\\\f/g
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
57 s/\\b/\\\\b/g
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
58 b test' "$@"