mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-05 15:11:30 -08:00
Code Issues Projects Releases Wiki Activity
49570 commits 243 branches 194 tags 751 MiB
Commit graph

17977 commits

Author SHA1 Message Date
Karoly Lorentey
cdcb5a4d25 (Sigh.) Don't try to read more events than the buffer size. 
src/xterm.c (XTread_socket): Don't try to read more events than
numchars.

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-102
 2004-02-26 00:52:10 +00:00
Karoly Lorentey
49c04a9f6d Merged in changes from CVS HEAD 
Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-113
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-114
   Merge some minor redisplay bug-fixes from emacs--tiling--0

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-115
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--tiling--0--patch-9
   Remove bogus xassert

 * miles@gnu.org--gnu-2004/emacs--tiling--0--patch-10
   Avoid negative descents for images with ascent > height

 * miles@gnu.org--gnu-2004/emacs--tiling--0--patch-13
   Fix iterator-inconsistency bug in redisplay


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-101
 2004-02-26 00:39:34 +00:00
Karoly Lorentey
1a10e2b722 Check for numchars > 0 in handle_one_xevent, not 1. 
src/xterm.c (handle_one_xevent): Check for numchars > 0 in the
KeyPress case, not 1.
(XTread_socket): Revert previous change.

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-100
 2004-02-26 00:37:31 +00:00
Kim F. Storm
dd341dd9c2 (handle_single_display_prop): Handle left-fringe and 
right-fringe similar to a display margin image.  Specifically,
the characters having the fringe prop are no longer shown, and
we use IT_IMAGE/next_element_from_image with image_id = -1 to
do this.  Set fringe bitmap face_id in it->face_id.
(produce_image_glyph): Handle image_id < 0 as "no image" case, but
still realize it->face (i.e. the fringe bitmap face).
 2004-02-25 22:39:54 +00:00
Kim F. Storm
446f5f3d09 *** empty log message *** 2004-02-25 22:38:34 +00:00
Miles Bader
7d8a0b5551 Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-114 
Merge some minor redisplay bug-fixes from emacs--tiling--0

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--tiling--0--patch-9
   Remove bogus xassert

 * miles@gnu.org--gnu-2004/emacs--tiling--0--patch-10
   Avoid negative descents for images with ascent > height

 * miles@gnu.org--gnu-2004/emacs--tiling--0--patch-13
   Fix iterator-inconsistency bug in redisplay
 2004-02-25 12:54:16 +00:00
Karoly Lorentey
46aab6b1e1 Revert patch-93, that was the real culprit. Reapply patch-97. 
src/keyboard.c (read_avail_input): Don't BLOCK_INPUT.

src/xterm.c (XTread_socket): Don't try to handle a new event if the
input buffer is full.

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-99
 2004-02-25 03:29:37 +00:00
Karoly Lorentey
174ab5e4da Back out previous change, it causes infinite recursion. 
src/xterm.c (XTread_socket): Back out previous change, it causes
infinite recursion.

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-98
 2004-02-25 03:16:45 +00:00
Karoly Lorentey
555886a1f1 Don't try to handle a new event if the input buffer is full. 
src/xterm.c (XTread_socket): Stop processing when numchars gets below 2.

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-97
 2004-02-25 02:57:36 +00:00
Karoly Lorentey
a0dc3cb69a Allow tty_read_avail_input to use the whole input buffer. 
src/keyboard.c (tty_read_avail_input): Use a cbuf of size numchar, not numchar-1.

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-96
 2004-02-25 02:55:32 +00:00
Karoly Lorentey
e39e965445 Merged in changes from CVS HEAD 
Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-108
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-109
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-110
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-111
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-112
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-94
 2004-02-24 22:48:10 +00:00
Jason Rumney
ce35edd1b7 *** empty log message *** 2004-02-24 21:36:21 +00:00
Karoly Lorentey
1cbfd76411 Block more input during read_avail_input. 
src/keyboard.c (read_avail_input): Added BLOCK_INPUT.
Return -1 when input is blocked or if we could not read input
and a display's input hook signalled an error.


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-93
 2004-02-24 18:00:36 +00:00
Jason Rumney
2f30610505 (slurp_file, xbm_scan, xbm_load_image) 
(xbm_read_bitmap_data): Use unsigned char for image data.
 2004-02-24 09:00:24 +00:00
Luc Teirlinck
92f5fba2d6 *** empty log message *** 2004-02-24 03:35:21 +00:00
Luc Teirlinck
7f144ff587 (Finsert_abbrev_table_description): Doc fix. 2004-02-24 03:32:29 +00:00
Jason Rumney
7420e0f55d (w32_draw_fringe_bitmap): Draw overlaid bitmaps 
correctly over other bitmaps.
 2004-02-22 22:41:52 +00:00
Jason Rumney
8565fb3d3c *** empty log message *** 2004-02-22 21:18:10 +00:00
Eli Zaretskii
f8125c39dd (USAGE1): Split into two halves. 
(USAGE2): Second half of the old USAGE1.
(USAGE3): Renamed from USAGE2.
(USAGE4): Renamed from USAGE3.
 2004-02-21 17:45:10 +00:00
Eli Zaretskii
4effffca65 *** empty log message *** 2004-02-21 14:09:01 +00:00
Eli Zaretskii
bb0b59bf75 (USAGE1): Add --no-desktop. Move --display from USAGE2. 
Fix --multibyte.  Move --help, --version to USAGE2.  Add alias
--file.  Fix -f, -l.  Sort options.  Untabify.
(USAGE2): Add -hb.  Fix --name, --title.  Sort options.  Untabify.
 2004-02-21 13:24:15 +00:00
Karoly Lorentey
4f6b8a07a3 Fix typo in delete_display_hook documentation. 
src/termhooks.h (delete_display_hook): Fix typo in documentation.

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-91
 2004-02-20 17:53:00 +00:00
Karoly Lorentey
81be1a9308 Don't delete a tty if it's the last device with frames. 
src/term.c (delete_tty): Signal an error if this is the last display
with live frames.  Reported by Dan Nicolaescu.

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-90
 2004-02-20 17:51:35 +00:00
Karoly Lorentey
823a1258f6 Don't read too many characters from the tty. 
src/keyboard.c (tty_read_avail_input): Don't read more characters than
numchars. (Prevents a crash if there are many characters in the buffer.)

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-89
 2004-02-20 17:48:48 +00:00
Karoly Lorentey
a225e738ab Merged in changes from CVS HEAD 
Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-107
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-88
 2004-02-20 15:42:55 +00:00
Karoly Lorentey
3b7fbceb83 Merged in changes from CVS HEAD 
Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-104
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-105
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-106
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-87
 2004-02-20 15:41:31 +00:00
Luc Teirlinck
923c1e6f75 *** empty log message *** 2004-02-20 03:49:52 +00:00
Luc Teirlinck
1d5c2b92a6 (Fdefine_category, Fcategory_docstring) 
(Fget_unused_category, Fset_category_table)
(Fcategory_set_mnemonics): Doc fixes.
 2004-02-20 03:40:19 +00:00
Kim F. Storm
2320865de4 Fix whitespace. 2004-02-19 23:26:06 +00:00
Kim F. Storm
351d2e147a Undo 2004-02-16 and 2004-02-17 changes. 
The following changes are relative to the 2004-01-21 revision.
(NREAD_INPUT_EVENTS): Define as max number of input events to read
in one call to read_socket_hook.  Value is 8.
(read_avail_input): Separate and rework handling of read_socket_hook
and non-read_socket_hook cases.  Use smaller input_event buffer
in read_socket_hook case, and repeat if full buffer is read.  Use
new local variable 'discard' to skip input after C-g.
In non-read_socket_hook case, just use a single input_event, and
call kbd_buffer_store_event on the fly for each character.
 2004-02-19 23:21:51 +00:00
Kim F. Storm
b0e225fd50 *** empty log message *** 2004-02-19 23:21:23 +00:00
Stefan Monnier
b15aa9f9e8 (union Lisp_Object): Give a more precise type for `type'. 
Remove unused `gu' alternative.
 2004-02-19 20:25:17 +00:00
Karoly Lorentey
bfdfad9294 Merged in changes from CVS HEAD 
Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-103
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-82
 2004-02-19 13:25:32 +00:00
Andreas Schwab
83c9aa95a3 . 2004-02-19 11:12:36 +00:00
Andreas Schwab
beaedd5620 (Fdefine_fringe_bitmap): Use && instead of & to avoid 
warning.
 2004-02-19 11:11:39 +00:00
Karoly Lorentey
24268213e1 Fix list-colors-display and other functions on a termcap frame 
src/term.c (get_tty_display): Fall back to the current device if
display is nil.  (Reported by Dan Nicolaescu <dann at ics dot uci dot edu>.)

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-81
 2004-02-19 02:27:31 +00:00
Karoly Lorentey
71e9b5ebf8 Added newly loaded stuff in loadup.el to src/Makefile.in. 
src/Makefile.in (SOME_MACHINE_LISP): Added X-related libraries that
were added to loadup.el.

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-79
 2004-02-19 02:06:18 +00:00
Kim F. Storm
1d71218362 (get_window_cursor_type, display_and_set_cursor): Fix last change. 2004-02-18 21:01:50 +00:00
Kim F. Storm
cc808173fc *** empty log message *** 2004-02-18 21:00:59 +00:00
Karoly Lorentey
ac3d262560 Merged in changes from CVS HEAD 
Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-98
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-99
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-100
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-101
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-102
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-78
 2004-02-18 17:10:32 +00:00
Kim F. Storm
5c7528cd68 (get_window_cursor_type): Don't look at glyph if NULL. 
(display_and_set_cursor): Set glyph to NULL if cursor in fringe.
 2004-02-17 21:36:00 +00:00
Kim F. Storm
b26f249f3e *** empty log message *** 2004-02-17 21:35:30 +00:00
Kim F. Storm
7a272039b5 (fast_find_position): Fix return value of new version 
(was inverted compared to the 21.1 version).
 2004-02-17 21:06:59 +00:00
Kim F. Storm
0bf7d00506 *** empty log message *** 2004-02-17 21:06:22 +00:00
Karoly Lorentey
e581a46687 Merged in changes from CVS HEAD 
Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-71
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-72
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-73
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-74
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-75
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-76
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-77
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-78
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-79
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-80
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-81
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-82
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-83
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-84
   Add lisp/emacs-lisp/macroexp.el

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-85
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-86
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-87
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-88
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-89
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-90
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-91
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-92
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-93
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-94
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-95
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-96
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-97
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-77
 2004-02-17 01:52:25 +00:00
Kim F. Storm
7371cef007 (in_read_avail_input): New static variable to handle re-entrancy. 
(read_avail_input): Change buf to pinter to read_avail_input_buf.
Use in_read_avail_input to handle re-entrance; when re-entered,
fully initialize and use tmp_buf array instead of read_avail_input_buf.
 2004-02-17 00:29:13 +00:00
Kim F. Storm
b9568dfc77 *** empty log message *** 2004-02-17 00:28:22 +00:00
Kim F. Storm
9940231136 Rework previous change; it didn't consider that the 
buf array was allocated on the stack.
(prev_read): Remove variable.
(read_avail_input_buf): New static event buffer array.
(in_read_avail_input): New static variable to avoid re-entrancy.
(read_avail_input): Change buf to pinter to read_avail_input_buf.
Use in_read_avail_input to guard against re-entry.
Do not initialize read_avail_input_buf here; instead assume it
is always cleared on entry.  To ensure that, we clear (just) the
entries that were used before we return.
(init_keyboard): Initialize read_avail_input_buf here.
 2004-02-16 23:13:13 +00:00
Kim F. Storm
ab90a54d2f *** empty log message *** 2004-02-16 23:11:58 +00:00
Eli Zaretskii
4e039f3f1f *** empty log message *** 2004-02-16 19:41:27 +00:00