Mercurial > hg > xemacs-beta
annotate src/sysdir.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 |
|---|---|
| 428 | 1 /* |
| 2 Copyright (C) 1995 Free Software Foundation, Inc. | |
| 771 | 3 Copyright (C) 2000 Ben Wing. |
| 428 | 4 |
| 5 This file is part of XEmacs. | |
| 6 | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
3717
diff
changeset
|
7 XEmacs is free software: you can redistribute it and/or modify it |
| 428 | 8 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:
3717
diff
changeset
|
9 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:
3717
diff
changeset
|
10 option) any later version. |
| 428 | 11 |
| 12 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 15 for more details. | |
| 16 | |
| 17 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:
3717
diff
changeset
|
18 along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 428 | 19 |
| 20 /* Synched up with: Not really in FSF. */ | |
| 21 | |
| 440 | 22 #ifndef INCLUDED_sysdir_h_ |
| 23 #define INCLUDED_sysdir_h_ | |
| 24 | |
| 428 | 25 #ifdef HAVE_UNISTD_H |
| 26 #include <unistd.h> | |
| 27 #endif | |
| 28 | |
| 29 #ifdef SYSV_SYSTEM_DIR | |
| 647 | 30 # define select select_ /* Shadowing yuck */ |
| 428 | 31 # include <dirent.h> |
| 647 | 32 # undef select |
| 442 | 33 #elif defined (WIN32_NATIVE) |
| 34 # include <direct.h> | |
| 35 # include "ndir.h" | |
| 432 | 36 #elif defined (NONSYSTEM_DIR_LIBRARY) |
| 428 | 37 # include "ndir.h" |
| 38 #else | |
| 39 # include <sys/dir.h> | |
| 40 #endif /* not NONSYSTEM_DIR_LIBRARY */ | |
| 41 | |
| 42 #ifdef SYSV_SYSTEM_DIR | |
| 43 # define DIRENTRY struct dirent | |
| 44 #else /* not SYSV_SYSTEM_DIR */ | |
| 45 # define DIRENTRY struct direct | |
| 46 #endif | |
| 47 | |
| 48 /* The d_nameln member of a struct dirent includes the '\0' character | |
| 49 on some systems, but not on others. What's worse, you can't tell | |
| 50 at compile-time which one it will be, since it really depends on | |
| 51 the sort of system providing the filesystem you're reading from, | |
| 52 not the system you are running on. Paul Eggert | |
| 53 <eggert@bi.twinsun.com> says this occurs when Emacs is running on a | |
| 54 SunOS 4.1.2 host, reading a directory that is remote-mounted from a | |
| 55 Solaris 2.1 host and is in a native Solaris 2.1 filesystem. | |
| 56 | |
| 57 (and Solaris 2 doesn't have a d_nameln member at all! Posix.1 | |
| 58 doesn't specify it -- mrb) | |
| 59 | |
| 60 Since applying strlen to the name always works, we'll just do that. */ | |
| 61 #define NAMLEN(p) strlen (p->d_name) | |
| 62 | |
| 3212 | 63 # define DIRENTRY_NONEMPTY(p) ((p)->d_ino) |
| 428 | 64 |
| 65 /* encapsulation: directory calls */ | |
| 66 | |
| 867 | 67 int qxe_chdir (const Ibyte *path); |
| 68 int qxe_mkdir (const Ibyte *path, mode_t mode); | |
| 69 DIR *qxe_opendir (const Ibyte *filename); | |
| 771 | 70 DIRENTRY *qxe_readdir (DIR *dirp); |
| 71 int qxe_closedir (DIR *dirp); | |
| 867 | 72 int qxe_rmdir (const Ibyte *path); |
| 428 | 73 |
| 867 | 74 Ibyte *qxe_allocating_getcwd (void); |
| 428 | 75 |
| 440 | 76 #endif /* INCLUDED_sysdir_h_ */ |