Mercurial > emacs
view oldXMenu/XDelAssoc.c @ 108113:cfcf7c495ca4
Fix crash with bidi display on the last empty line (bug#6030).
xdisp.c (display_line): Don't assume 2nd call to
get_next_display_element cannot return zero. (Bug#6030)
Move code that bidi-iterates out of display property to a separate function.
xdisp.c (iterate_out_of_display_property): New function, body from pop_it.
(pop_it): Use it.
author | Eli Zaretskii <eliz@gnu.org> |
---|---|
date | Sun, 25 Apr 2010 20:06:41 +0300 |
parents | fec5e03aaf59 |
children | ec58e5c426ef 5cc91198ffb2 a63dbe9548aa |
line wrap: on
line source
/* Copyright Massachusetts Institute of Technology 1985 */ #include "copyright.h" #include <X11/Xlib.h> #include "X10.h" void emacs_remque(); struct qelem { struct qelem *q_forw; struct qelem *q_back; char q_data[1]; }; /* * XDeleteAssoc - Delete an association in an XAssocTable keyed on * an XId. An association may be removed only once. Redundant * deletes are meaningless (but cause no problems). */ XDeleteAssoc(dpy, table, x_id) register Display *dpy; register XAssocTable *table; register XID x_id; { int hash; register XAssoc *bucket; register XAssoc *Entry; /* Hash the XId to get the bucket number. */ hash = x_id & (table->size - 1); /* Look up the bucket to get the entries in that bucket. */ bucket = &table->buckets[hash]; /* Get the first entry in the bucket. */ Entry = bucket->next; /* Scan through the entries in the bucket for the right XId. */ for (; Entry != bucket; Entry = Entry->next) { if (Entry->x_id == x_id) { /* We have the right XId. */ if (Entry->display == dpy) { /* We have the right display. */ /* We have the right entry! */ /* Remove it from the queue and */ /* free the entry. */ emacs_remque((struct qelem *)Entry); free((char *)Entry); return; } /* Oops, identical XId's on different displays! */ continue; } if (Entry->x_id > x_id) { /* We have gone past where it should be. */ /* It is apparently not in the table. */ return; } } /* It is apparently not in the table. */ return; } /* arch-tag: 90981a7e-601c-487a-b364-cdf55d6c475b (do not change this comment) */