Mercurial > hg > xemacs-beta
annotate src/strcat.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 | 2aa9cd456ae7 |
| children |
| rev | line source |
|---|---|
| 428 | 1 /* Copyright (C) 1991 Free Software Foundation, Inc. |
| 2 This file is part of the GNU C Library. | |
| 3 | |
| 5405 | 4 The GNU C Library is free software: you can redistribute it and/or modify it |
| 5 under the terms of the GNU General Public License as published by the | |
| 6 Free Software Foundation, either version 3 of the License, or (at your | |
| 7 option) any later version. | |
| 428 | 8 |
| 5405 | 9 The GNU C Library is distributed in the hope that it will be useful, but WITHOUT |
| 10 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 11 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 12 for more details. | |
| 428 | 13 |
| 5405 | 14 You should have received a copy of the GNU General Public License |
| 15 along with the GNU C Library. If not, see <http://www.gnu.org/licenses/>. */ | |
| 428 | 16 |
| 17 /* Synched up with: Not in FSF. */ | |
| 18 | |
| 19 # include <config.h> | |
| 20 # ifndef REGISTER /* Strictly enforced in 20.3 */ | |
| 21 # define REGISTER | |
| 22 # endif | |
| 23 | |
| 24 /* In HPUX 10 the strcat function references memory past the last byte of | |
| 25 the string! This will core dump if the memory following the last byte is | |
| 26 not mapped. | |
| 27 | |
| 442 | 28 Here is a correct version from, glibc 1.09. |
| 428 | 29 */ |
| 30 | |
| 31 char *strcat (char *dest, const char *src); | |
| 32 | |
| 33 /* Append SRC on the end of DEST. */ | |
| 34 char * | |
| 35 strcat (char *dest, const char *src) | |
| 36 { | |
| 37 REGISTER char *s1 = dest; | |
| 442 | 38 REGISTER const char *s2 = src; |
| 428 | 39 char c; |
| 40 | |
| 41 /* Find the end of the string. */ | |
| 42 do | |
| 43 c = *s1++; | |
| 44 while (c != '\0'); | |
| 45 | |
| 46 /* Make S1 point before the next character, so we can increment | |
| 47 it while memory is read (wins on pipelined cpus). */ | |
| 48 s1 -= 2; | |
| 49 | |
| 50 do | |
| 51 { | |
| 52 c = *s2++; | |
| 53 *++s1 = c; | |
| 54 } | |
| 55 while (c != '\0'); | |
| 56 | |
| 57 return dest; | |
| 58 } |