[21.5] Quiet GCC 4 whining about unused values
18 years, 6 months
Stephen J. Turnbull
Stephen J. Turnbull
21.5
Marcus, your opinion would be appreciated on this one. Seems
"obviously correct" to me, but ....
GCC 4 whines about unused values, and it's right. I think this patch
actually makes the code clearer, as well.
diff --git a/src/ChangeLog b/src/ChangeLog
index b9f6993..3fa529a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
＠＠ -0,0 +1,4 ＠＠
+2006-06-24 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * gc.c (gc_mark_root_set): Quiet GCC 4 whining about unused values.
+
diff --git a/src/gc.c b/src/gc.c
index 972821a..18f0944 100644
--- a/src/gc.c
+++ b/src/gc.c
＠＠ -1623,29 +1623,25 ＠＠ gc_mark_root_set (
{ /* staticpro() */
Lisp_Object **p = Dynarr_begin (staticpros);
Elemcount count;
- for (count = Dynarr_length (staticpros); count; count--)
+ for (count = Dynarr_length (staticpros); count; count--, p++)
/* Need to check if the pointer in the staticpro array is not
NULL. A gc can occur after variable is added to the staticpro
array and _before_ it is correctly initialized. In this case
its value is NULL, which we have to catch here. */
if (*p)
- mark_object (**p++);
- else
- **p++;
+ mark_object (**p);
}
{ /* staticpro_nodump() */
Lisp_Object **p = Dynarr_begin (staticpros_nodump);
Elemcount count;
- for (count = Dynarr_length (staticpros_nodump); count; count--)
+ for (count = Dynarr_length (staticpros_nodump); count; count--, p++)
/* Need to check if the pointer in the staticpro array is not
NULL. A gc can occur after variable is added to the staticpro
array and _before_ it is correctly initialized. In this case
its value is NULL, which we have to catch here. */
if (*p)
- mark_object (**p++);
- else
- **p++;
+ mark_object (**p);
}
#ifdef NEW_GC
--
Graduate School of Systems and Information Engineering University of Tsukuba
http://turnbull.sk.tsukuba.ac.jp/ Tennodai 1-1-1 Tsukuba 305-8573 JAPAN
Economics of Information Communication and Computation Systems
Experimental Economics, Microeconomic Theory, Game Theory
- 2 participants
- 1 comments
[AC 21.5] Scrollbar NULL checks
18 years, 6 months
Jerry James
Jerry James
APPROVE COMMIT 21.5
I already patched scrollbar-x.c to fix code where a pointer was
dereferenced twice, then checked to see if it is NULL. This patch fixes
the same problem in the same place in scrollbar-gtk.c and
scrollbar-msw.c.
src/ChangeLog addition:
2006-06-29 Jerry James <james(a)xemacs.org>
* scrollbar-gtk.c (gtk_free_scrollbar_instance): Compare
instance->scrollbar_data against NULL before using it.
* scrollbar-msw.c (mswindows_free_scrollbar_instance): Compare
sb->scrollbar_data against NULL before using it.
xemacs-21.5 source patch:
Diff command: cvs -q diff -uN
Files affected: src/scrollbar-msw.c src/scrollbar-gtk.c
Index: src/scrollbar-gtk.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/scrollbar-gtk.c,v
retrieving revision 1.19
diff -d -u -r1.19 scrollbar-gtk.c
--- src/scrollbar-gtk.c 2005/10/25 08:32:48 1.19
+++ src/scrollbar-gtk.c 2006/06/29 16:48:59
＠＠ -56,14 +56,16 ＠＠
static void
gtk_free_scrollbar_instance (struct scrollbar_instance *instance)
{
- if (SCROLLBAR_GTK_WIDGET (instance))
+ if (instance->scrollbar_data)
{
- gtk_widget_hide_all (SCROLLBAR_GTK_WIDGET (instance));
- gtk_widget_destroy (SCROLLBAR_GTK_WIDGET (instance));
- }
+ if (SCROLLBAR_GTK_WIDGET (instance))
+ {
+ gtk_widget_hide_all (SCROLLBAR_GTK_WIDGET (instance));
+ gtk_widget_destroy (SCROLLBAR_GTK_WIDGET (instance));
+ }
- if (instance->scrollbar_data)
- xfree (instance->scrollbar_data, void *);
+ xfree (instance->scrollbar_data, void *);
+ }
}
/* A device method. */
Index: src/scrollbar-msw.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/scrollbar-msw.c,v
retrieving revision 1.31
diff -d -u -r1.31 scrollbar-msw.c
--- src/scrollbar-msw.c 2005/10/25 08:32:49 1.31
+++ src/scrollbar-msw.c 2006/06/29 16:48:59
＠＠ -90,17 +90,19 ＠＠
static void
mswindows_free_scrollbar_instance (struct scrollbar_instance *sb)
{
- void *opaque =
- (void *) qxeGetWindowLong (SCROLLBAR_MSW_HANDLE (sb), GWL_USERDATA);
- Lisp_Object ptr;
-
- ptr = VOID_TO_LISP (opaque);
- assert (OPAQUE_PTRP (ptr));
- ptr = Fremhash (ptr, Vmswindows_scrollbar_instance_table);
- assert (!NILP (ptr));
- DestroyWindow (SCROLLBAR_MSW_HANDLE (sb));
if (sb->scrollbar_data)
- xfree (sb->scrollbar_data, void *);
+ {
+ void *opaque =
+ (void *) qxeGetWindowLong (SCROLLBAR_MSW_HANDLE (sb), GWL_USERDATA);
+ Lisp_Object ptr;
+
+ ptr = VOID_TO_LISP (opaque);
+ assert (OPAQUE_PTRP (ptr));
+ ptr = Fremhash (ptr, Vmswindows_scrollbar_instance_table);
+ assert (!NILP (ptr));
+ DestroyWindow (SCROLLBAR_MSW_HANDLE (sb));
+ xfree (sb->scrollbar_data, void *);
+ }
}
static void
--
Jerry James, Assistant Professor james(a)xemacs.org
Computer Science Department http://www.cs.usu.edu/~jerry/
Utah State University
- 1 participants
- 0 comments
[21.5] Have configure maybe create src/depend
18 years, 6 months
Stephen J. Turnbull
Stephen J. Turnbull
21.5
I don't know if this is a great idea or not. My git repositories do
not contain configure or src/depend, and every time I do "git clone"
(or even "git pull" in some situations) I get bit.
This patch adds a configure test for existence of src/depend, and if
it doesn't exist, configure tries to create it (in $srcdir/src). As
far as I can tell this is guaranteed win---if src/depend exists, it's
a no-op and if it doesn't configure will succeed where it used to fail
because it couldn't find depend.
I wonder if it wouldn't be better to create it in $blddir.
Comments requested.
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/ChangeLog,v
retrieving revision 1.506
diff -u -r1.506 ChangeLog
--- ChangeLog 6 Jun 2006 00:18:28 -0000 1.506
+++ ChangeLog 23 Jun 2006 14:10:20 -0000
＠＠ -0,0 +1,5 ＠＠
+2006-06-23 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * configure.ac (Build Makefile.in's from Makefile.in.in's):
+ Create $srcdir/src/depend if it's missing.
+
Index: configure.ac
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v
retrieving revision 1.43
diff -u -r1.43 configure.ac
--- configure.ac 6 Jun 2006 00:18:29 -0000 1.43
+++ configure.ac 23 Jun 2006 14:10:21 -0000
＠＠ -6218,6 +6218,14 ＠＠
dnl module Makefiles will have the common text in
dnl modules/common/Makefile.common appended.
+dnl this actually should be conditional on having perl (ie, effectively
+dnl unconditional on sane systems)
+if test -r $srcdir/src/depend; then :;
+else
+ echo "creating $srcdir/src/depend"
+ perl $srcdir/src/make-src-depend > $srcdir/src/depend
+fi
+
for file in $internal_makefile_list; do
case $file in
src/Makefile.in ) file="src/Makefile.in:src/Makefile.in.in:src/depend" ;;
--
Graduate School of Systems and Information Engineering University of Tsukuba
http://turnbull.sk.tsukuba.ac.jp/ Tennodai 1-1-1 Tsukuba 305-8573 JAPAN
Economics of Information Communication and Computation Systems
Experimental Economics, Microeconomic Theory, Game Theory
- 2 participants
- 1 comments
[PATCH] Change ABORTs in the X code to assertions.
18 years, 6 months
Aidan Kehoe
Aidan Kehoe
A while ago I applied a patch that avoided calling certain X code when the
corresponding XEmacs device was being deleted. At the time my impression was
that the X code in general called ABORT() in contexts where it should rather
check if any frames exist on other devices, and delete the X device and
throw to top level if so.
That’s not true. The X code, while filled with calls to ABORT(), only calls
it in truly exceptional conditions, that indicate programming errors
somewhere, the sort of place where an assertion would be a better choice
since the check can be turned off in a production build. This patch changes
them to assertions; I’d especially like any commentary on it from Jerry,
since you’ve been looking at this code in detail recently.
src/ChangeLog addition:
2006-06-25 Aidan Kehoe <kehoea(a)parhasard.net>
* event-Xt.c (x_event_to_emacs_event):
Fix my spelling.
* device-x.c (get_device_from_display):
* device-x.c (x_get_visual_depth):
* event-Xt.c (Xt_process_to_emacs_event):
* frame-x.c (x_wm_mark_shell_size_user_specified):
* frame-x.c (x_wm_mark_shell_position_user_specified):
* frame-x.c (x_wm_set_shell_iconic_p):
* frame-x.c (x_wm_set_cell_size):
* frame-x.c (x_wm_set_variable_size):
* frame-x.c (x_wm_store_class_hints):
* frame-x.c (x_wm_maybe_store_wm_command):
* frame-x.c (x_initialize_frame_size):
* glyphs-x.c (extract_xpm_color_names):
* menubar-x.c (set_frame_menubar):
* scrollbar-x.c (x_update_scrollbar_instance_status):
* xgccache.c (gc_cache_lookup):
Change various checks followed by ABORT() to assertions instead,
since they are, semantically, checks of conditions that will only
fail in the event of a bug or a ridiculously exceptional
condition.
XEmacs Trunk source patch:
Diff command: cvs -q diff -u
Files affected: src/xgccache.c src/scrollbar-x.c src/menubar-x.c src/glyphs-x.c src/frame-x.c src/event-Xt.c src/device-x.c
Index: src/device-x.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/device-x.c,v
retrieving revision 1.67
diff -u -u -r1.67 device-x.c
--- src/device-x.c 2006/06/21 17:30:35 1.67
+++ src/device-x.c 2006/06/25 10:13:08
＠＠ -152,24 +152,8 ＠＠
{
struct device *d = get_device_from_display_1 (dpy);
-#if !defined(INFODOCK)
-# define FALLBACK_RESOURCE_NAME "xemacs"
-# else
-# define FALLBACK_RESOURCE_NAME "infodock"
-#endif
-
- if (!d)
- {
- /* This isn't one of our displays. Let's crash? */
- stderr_out
- ("\n%s: Fatal X Condition. Asked about display we don't own: \"%s\"\n",
- (STRINGP (Vinvocation_name) ?
- (char *) XSTRING_DATA (Vinvocation_name) : FALLBACK_RESOURCE_NAME),
- DisplayString (dpy) ? DisplayString (dpy) : "???");
- ABORT();
- }
-
-#undef FALLBACK_RESOURCE_NAME
+ /* This needs to be one of our displays. */
+ assert(d);
return d;
}
＠＠ -469,7 +453,8 ＠＠
vi_in.visualid = XVisualIDFromVisual (visual);
vi_out = XGetVisualInfo (dpy, /*VisualScreenMask|*/VisualIDMask,
&vi_in, &out_count);
- if (! vi_out) ABORT ();
+ assert(vi_out);
+
d = vi_out [0].depth;
XFree ((char *) vi_out);
return d;
Index: src/event-Xt.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/event-Xt.c,v
retrieving revision 1.91
diff -u -u -r1.91 event-Xt.c
--- src/event-Xt.c 2005/12/24 19:54:01 1.91
+++ src/event-Xt.c 2006/06/25 10:13:10
＠＠ -1122,7 +1122,7 ＠＠
This _might_ be possible within an XKB framework, changing
the keyboard to a US XKB layout for a moment at startup,
- storing the correspondance, and changing it back. But that
+ storing the correspondence, and changing it back. But that
won't work on non-XKB servers, it makes our already slow
startup slower, and it's not clear that it's really any
easier or more maintainable than storing a correspondence in
＠＠ -2419,7 +2419,8 ＠＠
return;
}
}
- ABORT ();
+
+ assert (0);
}
static void
Index: src/frame-x.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/frame-x.c,v
retrieving revision 1.75
diff -u -u -r1.75 frame-x.c
--- src/frame-x.c 2006/06/19 18:49:23 1.75
+++ src/frame-x.c 2006/06/25 10:13:11
＠＠ -230,14 +230,14 ＠＠
void
x_wm_mark_shell_size_user_specified (Widget wmshell)
{
- if (! XtIsWMShell (wmshell)) ABORT ();
+ assert (XtIsWMShell (wmshell));
EmacsShellSetSizeUserSpecified (wmshell);
}
void
x_wm_mark_shell_position_user_specified (Widget wmshell)
{
- if (! XtIsWMShell (wmshell)) ABORT ();
+ assert (XtIsWMShell (wmshell));
EmacsShellSetPositionUserSpecified (wmshell);
}
＠＠ -246,7 +246,7 ＠＠
void
x_wm_set_shell_iconic_p (Widget shell, int iconic_p)
{
- if (! XtIsWMShell (shell)) ABORT ();
+ assert (XtIsWMShell (shell));
/* Because of questionable logic in Shell.c, this sequence can't work:
＠＠ -275,10 +275,8 ＠＠
{
Arg al [2];
- if (!XtIsWMShell (wmshell))
- ABORT ();
- if (cw <= 0 || ch <= 0)
- ABORT ();
+ assert (XtIsWMShell (wmshell));
+ assert (!(cw <= 0 || ch <= 0));
XtSetArg (al[0], XtNwidthInc, cw);
XtSetArg (al[1], XtNheightInc, ch);
＠＠ -290,8 +288,8 ＠＠
{
Arg al [2];
- if (!XtIsWMShell (wmshell))
- ABORT ();
+ assert (XtIsWMShell (wmshell));
+
#ifdef DEBUG_GEOMETRY_MANAGEMENT
/* See comment in EmacsShell.c */
printf ("x_wm_set_variable_size: %d %d\n", width, height);
＠＠ -359,8 +357,7 ＠＠
Extbyte *app_name, *app_class;
XClassHint classhint;
- if (!XtIsWMShell (shell))
- ABORT ();
+ assert (XtIsWMShell (shell));
XtGetApplicationNameAndClass (dpy, &app_name, &app_class);
classhint.res_name = frame_name;
＠＠ -376,8 +373,7 ＠＠
Widget w = FRAME_X_SHELL_WIDGET (f);
struct device *d = XDEVICE (FRAME_DEVICE (f));
- if (!XtIsWMShell (w))
- ABORT ();
+ assert (XtIsWMShell (w));
if (NILP (DEVICE_X_WM_COMMAND_FRAME (d)))
{
＠＠ -1573,8 +1569,7 ＠＠
/* OK, we're a top-level shell. */
- if (!XtIsWMShell (wmshell))
- ABORT ();
+ assert (XtIsWMShell (wmshell));
/* If the EmacsFrame doesn't have a geometry but the shell does,
treat that as the geometry of the frame.
Index: src/glyphs-x.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/glyphs-x.c,v
retrieving revision 1.84
diff -u -u -r1.84 glyphs-x.c
--- src/glyphs-x.c 2005/11/26 11:46:08 1.84
+++ src/glyphs-x.c 2006/06/25 10:13:13
＠＠ -1328,10 +1328,13 ＠＠
{
Lisp_Object cons = XCAR (results);
color = COLOR_INSTANCE_X_COLOR (XCOLOR_INSTANCE (XCDR (cons)));
+ Status alloced;
/* Duplicate the pixel value so that we still have a lock on it if
the pixel we were passed is later freed. */
- if (! XAllocColor (dpy, cmap, &color))
- ABORT (); /* it must be allocable since we're just duplicating it */
+
+ alloced = XAllocColor (dpy, cmap, &color);
+ assert (alloced); /* it must be allocable since we're just
+ duplicating it */
TO_EXTERNAL_FORMAT (LISP_STRING, XCAR (cons), C_STRING_MALLOC,
symbols[i].name, Qctext);
Index: src/menubar-x.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/menubar-x.c,v
retrieving revision 1.46
diff -u -u -r1.46 menubar-x.c
--- src/menubar-x.c 2005/10/25 11:16:26 1.46
+++ src/menubar-x.c 2006/06/25 10:13:13
＠＠ -575,8 +575,8 ＠＠
menubar_visible = !NILP (w->menubar_visible_p);
data = compute_menubar_data (f, menubar, deep_p);
- if (!data || (!data->next && !data->contents))
- ABORT ();
+
+ assert (!(!data || (!data->next && !data->contents)));
if (!FRAME_X_MENUBAR_ID (f))
FRAME_X_MENUBAR_ID (f) = new_lwlib_id ();
Index: src/scrollbar-x.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/scrollbar-x.c,v
retrieving revision 1.32
diff -u -u -r1.32 scrollbar-x.c
--- src/scrollbar-x.c 2006/06/19 18:19:38 1.32
+++ src/scrollbar-x.c 2006/06/25 10:13:13
＠＠ -283,7 +283,7 ＠＠
}
}
- if (!wv->scrollbar_data) ABORT ();
+ assert (wv->scrollbar_data);
free_widget_value_tree (wv);
}
else if (managed)
Index: src/xgccache.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/xgccache.c,v
retrieving revision 1.14
diff -u -u -r1.14 xgccache.c
--- src/xgccache.c 2006/02/17 11:19:19 1.14
+++ src/xgccache.c 2006/06/25 10:13:13
＠＠ -162,8 +162,8 ＠＠
(void) describe_gc_cache (cache, DGCCFLAG_DISABLE);
#endif
- if ((!!cache->head) != (!!cache->tail)) ABORT ();
- if (cache->head && (cache->head->prev || cache->tail->next)) ABORT ();
+ assert ((!!cache->head) == (!!cache->tail));
+ assert(!((cache->head && (cache->head->prev || cache->tail->next))));
gcvm.mask = mask;
gcvm.gcv = *gcv; /* this copies... */
＠＠ -215,10 +215,12 ＠＠
cell->prev = cache->tail;
cache->tail->next = cell;
cache->tail = cell;
- if (cache->head == cell) ABORT ();
- if (cell->next) ABORT ();
- if (cache->head->prev) ABORT ();
- if (cache->tail->next) ABORT ();
+
+ assert (cache->head != cell);
+ assert (!(cell->next));
+ assert (!(cache->head->prev));
+ assert (!(cache->tail->next));
+
return cell->gc;
}
＠＠ -242,10 +244,10 ＠＠
remhash (&cell->gcvm, cache->table);
#endif
}
- else if (cache->size > GC_CACHE_SIZE)
- ABORT ();
else
{
+ assert (!(cache->size > GC_CACHE_SIZE));
+
/* Allocate a new cell (don't put it in the list or table yet). */
cell = xnew (struct gc_cache_cell);
cache->size++;
--
Santa Maradona, priez pour moi!
- 4 participants
- 3 comments
[PATCH 21.5] Redisplay leaks Dynarrs
18 years, 6 months
Jerry James
Jerry James
PATCH 21.5
It looks like, back in the mists of time, somebody wrote some redisplay
code that leaks Dynarrs, and everybody who created a new redisplay-***.c
since then copied the leaky code. In each of the redisplay-***.c files,
in the *_output_display_block function, the Dynarr named buf gets
initialized when buf is declared. But if there is nothing to do, the
function returns almost immediately, without freeing buf. This patch
moves the creation of the Dynarr past the point where the function can
return early. I also nuked the calls to Dynarr_reset, because they do
nothing when applied to a freshly created Dynarr.
A 21.4 version of the patches I've applied recently is forthcoming. It
will include this leak fix as well.
src/ChangeLog addition:
2006-06-22 Jerry James <james(a)xemacs.org>
* redisplay-gtk.c (gtk_output_display_block): Fix a Dynarr leak.
Don't create the buffer if there is nothing to do.
* redisplay-msw.c (mswindows_output_display_block): Ditto.
* redisplay-output.c (redisplay_output_layout): Ditto.
* redisplay-tty.c (tty_output_display_block): Ditto.
* redisplay-x.c (x_output_display_block): Ditto.
xemacs-21.5 source patch:
Diff command: cvs -q diff -uN
Files affected: src/redisplay-x.c src/redisplay-tty.c src/redisplay-output.c src/redisplay-msw.c src/redisplay-gtk.c
Index: src/redisplay-gtk.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/redisplay-gtk.c,v
retrieving revision 1.18
diff -d -u -r1.18 redisplay-gtk.c
--- src/redisplay-gtk.c 2005/11/22 11:24:45 1.18
+++ src/redisplay-gtk.c 2006/06/22 22:45:37
＠＠ -293,7 +293,7 ＠＠
int cursor_width, int cursor_height)
{
struct frame *f = XFRAME (w->frame);
- Ichar_dynarr *buf = Dynarr_new (Ichar);
+ Ichar_dynarr *buf;
Lisp_Object window;
struct display_block *db = Dynarr_atp (dl->display_blocks, block);
＠＠ -325,7 +325,7 ＠＠
if (end < 0)
end = Dynarr_length (rba);
- Dynarr_reset (buf);
+ buf = Dynarr_new (Ichar);
while (elt < end)
{
Index: src/redisplay-msw.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/redisplay-msw.c,v
retrieving revision 1.42
diff -d -u -r1.42 redisplay-msw.c
--- src/redisplay-msw.c 2005/01/24 23:34:07 1.42
+++ src/redisplay-msw.c 2006/06/22 22:45:37
＠＠ -907,7 +907,7 ＠＠
int cursor_width, int cursor_height)
{
struct frame *f = XFRAME (w->frame);
- Ichar_dynarr *buf = Dynarr_new (Ichar);
+ Ichar_dynarr *buf;
Lisp_Object window;
struct display_block *db = Dynarr_atp (dl->display_blocks, block);
＠＠ -934,7 +934,7 ＠＠
if (end < 0)
end = Dynarr_length (rba);
- Dynarr_reset (buf);
+ buf = Dynarr_new (Ichar);
while (elt < end)
{
Index: src/redisplay-output.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/redisplay-output.c,v
retrieving revision 1.26
diff -d -u -r1.26 redisplay-output.c
--- src/redisplay-output.c 2005/01/24 23:34:07 1.26
+++ src/redisplay-output.c 2006/06/22 22:45:37
＠＠ -1407,7 +1407,7 ＠＠
{
Lisp_Image_Instance *p = XIMAGE_INSTANCE (image_instance);
Lisp_Object rest, window = DOMAIN_WINDOW (domain);
- Ichar_dynarr *buf = Dynarr_new (Ichar);
+ Ichar_dynarr *buf;
struct window *w = XWINDOW (window);
struct device *d = DOMAIN_XDEVICE (domain);
int layout_height, layout_width;
＠＠ -1423,6 +1423,8 ＠＠
/* This makes the glyph area fit into the display area. */
if (!redisplay_normalize_glyph_area (db, dga))
return;
+
+ buf = Dynarr_new (Ichar);
/* Highly dodgy optimization. We want to only output the whole
layout if we really have to. */
Index: src/redisplay-tty.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/redisplay-tty.c,v
retrieving revision 1.25
diff -d -u -r1.25 redisplay-tty.c
--- src/redisplay-tty.c 2005/01/24 23:34:07 1.25
+++ src/redisplay-tty.c 2006/06/22 22:45:37
＠＠ -206,7 +206,7 ＠＠
int UNUSED (cursor_height))
{
struct frame *f = XFRAME (w->frame);
- Ichar_dynarr *buf = Dynarr_new (Ichar);
+ Ichar_dynarr *buf;
struct display_block *db = Dynarr_atp (dl->display_blocks, block);
rune_dynarr *rba = db->runes;
＠＠ -232,7 +232,7 ＠＠
if (end < 0)
end = Dynarr_length (rba);
- Dynarr_reset (buf);
+ buf = Dynarr_new (Ichar);
while (elt < end && Dynarr_atp (rba, elt)->xpos < start_pixpos)
{
Index: src/redisplay-x.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/redisplay-x.c,v
retrieving revision 1.42
diff -d -u -r1.42 redisplay-x.c
--- src/redisplay-x.c 2006/06/03 17:50:55 1.42
+++ src/redisplay-x.c 2006/06/22 22:45:38
＠＠ -432,7 +432,7 ＠＠
#ifndef USE_XFT
struct frame *f = XFRAME (w->frame);
#endif
- Ichar_dynarr *buf = Dynarr_new (Ichar);
+ Ichar_dynarr *buf;
Lisp_Object window;
struct display_block *db = Dynarr_atp (dl->display_blocks, block);
＠＠ -459,7 +459,7 ＠＠
if (end < 0)
end = Dynarr_length (rba);
- Dynarr_reset (buf);
+ buf = Dynarr_new (Ichar);
while (elt < end)
{
--
Jerry James, Assistant Professor james(a)xemacs.org
Computer Science Department http://www.cs.usu.edu/~jerry/
Utah State University
- 1 participants
- 1 comments
[COMMIT] Stop complaining about unknown Unicode keysyms.
18 years, 6 months
Aidan Kehoe
Aidan Kehoe
The committed patch fills out a blank ChangeLog entry from the start of
June which shouldn’t have been blank at all.
NOTE: This patch has been committed.
lisp/ChangeLog addition:
2006-06-25 Aidan Kehoe <kehoea(a)parhasard.net>
* x-init.el (x-initialize-keyboard):
No longer warn about Unicode keysyms without a mapping, since we
now have valid mappings for all Unicode keysyms.
XEmacs Trunk source patch:
Diff command: cvs -q diff -u
Files affected: lisp/x-init.el
Index: lisp/x-init.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/x-init.el,v
retrieving revision 1.17
diff -u -u -r1.17 x-init.el
--- lisp/x-init.el 2006/06/03 17:50:40 1.17
+++ lisp/x-init.el 2006/06/25 17:21:01
＠＠ -234,42 +234,7 ＠＠
(x-win-init-sun))
((string-match "XFree86" vendor)
;; Those XFree86 people do some weird keysym stuff, too.
- (x-win-init-xfree86))))
- ;; Perhaps tell people that some keys won't work.
- ;;
- ;; If they remap while XEmacs is running and this problem arises, they
- ;; won't see the messages. Which should be okay, assuming the length of
- ;; time before we get a Unicode-compatible internal encoding is relatively
- ;; short.
- (let (unknown-code-points sym-string)
- (dolist (x-keysym (hash-table-key-list (x-keysym-hash-table)))
- (setq sym-string (if (stringp x-keysym) x-keysym (symbol-name x-keysym)))
- (when (and (not (get (intern sym-string) 'character-of-keysym))
- (string-match "^U[0-9A-F]+$" sym-string))
- (pushnew (concat sym-string " ") unknown-code-points :test 'equal)))
- (when (and (featurep 'mule) unknown-code-points)
- (lwarn 'key-mapping 'info
- "Undefined Unicode key mappings.
-Your keyboard has, among many others, the following keysyms defined:
-
-%s
-The standards say that applications should interpret these keysyms as
-representing the corresponding Unicode code points (e.g. U2720 should
-represent MALTESE CROSS), but unfortunately the current version of XEmacs
-has no support for many of those characters in its internal encoding, and
-when it encounters the keysyms corresponding to those characters, they
-remain unbound.
-
-See the documentation for `unicode-to-char' for one technique if you have an
-urgent need for support for one of those characters--you probably don't,
-most of the widely-used characters have mappings in the internal XEmacs
-encoding--otherwise, wait until we ship a version with an internal encoding
-based on Unicode. "
- (with-string-as-buffer-contents (apply 'concat " "
- unknown-code-points)
- (setq fill-prefix " ")
- (fill-paragraph nil))))))
-
+ (x-win-init-xfree86)))))
;; Moved from x-toolbar.el, since InfoDock doesn't dump x-toolbar.el.
(defun x-init-toolbar-from-resources (locale)
--
Santa Maradona, priez pour moi!
- 1 participants
- 0 comments
[COMMIT] Don't error on non-character keys in read-quoted-char
18 years, 6 months
Aidan Kehoe
Aidan Kehoe
This has been occasionally annoying me for months.
NOTE: This patch has been committed.
lisp/ChangeLog addition:
2006-06-25 Aidan Kehoe <kehoea(a)parhasard.net>
* cmdloop.el (read-quoted-char):
Don't error on non-character keys, accept them as terminating the
sequence.
XEmacs Trunk source patch:
Diff command: cvs -q diff -u
Files affected: lisp/cmdloop.el
Index: lisp/cmdloop.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/cmdloop.el,v
retrieving revision 1.21
diff -u -u -r1.21 cmdloop.el
--- lisp/cmdloop.el 2006/04/16 17:09:30 1.21
+++ lisp/cmdloop.el 2006/06/25 13:56:21
＠＠ -577,10 +577,9 ＠＠
read-quoted-char-radix)))
(and prompt (display-message 'prompt (format "%s-" prompt)))
(setq event (next-command-event)
- char (or (event-to-character event)
- (signal 'error
- (list "key read cannot be inserted in a buffer"
- event))))
+ ;; If event-to-character fails, this is fine, we handle that
+ ;; with the (null char) cond branch below.
+ char (event-to-character event))
(if inhibit-quit (setq quit-flag nil)))
;; Translate TAB key into control-I ASCII character, and so on.
(and char
--
Santa Maradona, priez pour moi!
- 1 participants
- 0 comments
[COMMIT] Fix some assertions in latin-unity
18 years, 6 months
Aidan Kehoe
Aidan Kehoe
NOTE: This patch has been committed.
mule-packages/latin-unity/ChangeLog addition:
2006-06-25 Aidan Kehoe <kehoea(a)parhasard.net>
* latin-unity-latin10.el (charsetp):
* latin-unity-latin10.el (coding-system-p):
* latin-unity-latin7.el (charsetp):
* latin-unity-latin7.el (coding-system-p):
* latin-unity-latin8.el (charsetp):
* latin-unity-latin8.el (coding-system-p):
* latin-unity-latin9.el (charsetp):
* latin-unity-latin9.el (coding-system-p):
I didn't understand assert's calling conventions when writing this
code, and as a result an assertion failure doesn't show the string
I intended it to.
XEmacs Packages source patch:
Diff command: cvs -q diff -u
Files affected: mule-packages/latin-unity/latin-unity-latin9.el mule-packages/latin-unity/latin-unity-latin8.el mule-packages/latin-unity/latin-unity-latin7.el mule-packages/latin-unity/latin-unity-latin10.el
Index: mule-packages/latin-unity/latin-unity-latin10.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/mule-packages/latin-unity/latin-unity-latin10.el,v
retrieving revision 1.2
diff -u -u -r1.2 latin-unity-latin10.el
--- mule-packages/latin-unity/latin-unity-latin10.el 2005/02/15 22:22:47 1.2
+++ mule-packages/latin-unity/latin-unity-latin10.el 2006/06/25 09:33:07
＠＠ -46,16 +46,16 ＠＠
;; Check that we're functionally equivalent to the old latin-unity-latin10.el
;; The character set should exist.
-(assert (charsetp (find-charset 'latin-iso8859-16))
+(assert (charsetp (find-charset 'latin-iso8859-16)) t
"`latin-euro-standards' didn't provide a Latin 10 character set!")
;; As should the coding system.
-(assert (coding-system-p (find-coding-system 'iso-8859-16))
+(assert (coding-system-p (find-coding-system 'iso-8859-16)) t
"`latin-euro-standards' didn't provide a Latin 10 coding system!")
;; And we should have a language environment.
(assert
- (assoc "Latin-10" language-info-alist)
+ (assoc "Latin-10" language-info-alist) t
"`latin-euro-standards' didn't provide a Latin 10 language environment!")
(provide 'latin-unity-latin10)
Index: mule-packages/latin-unity/latin-unity-latin7.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/mule-packages/latin-unity/latin-unity-latin7.el,v
retrieving revision 1.2
diff -u -u -r1.2 latin-unity-latin7.el
--- mule-packages/latin-unity/latin-unity-latin7.el 2005/02/15 22:22:47 1.2
+++ mule-packages/latin-unity/latin-unity-latin7.el 2006/06/25 09:33:07
＠＠ -46,16 +46,16 ＠＠
;; Check that we're functionally equivalent to the old latin-unity-latin7.el
;; The character set should exist.
-(assert (charsetp (find-charset 'latin-iso8859-13))
+(assert (charsetp (find-charset 'latin-iso8859-13)) t
"`latin-euro-standards' didn't provide a Latin 7 character set!")
;; As should the coding system.
-(assert (coding-system-p (find-coding-system 'iso-8859-13))
+(assert (coding-system-p (find-coding-system 'iso-8859-13)) t
"`latin-euro-standards' didn't provide a Latin 7 coding system!")
;; And we should have a language environment.
(assert
- (assoc "Latin-7" language-info-alist)
+ (assoc "Latin-7" language-info-alist) t
"`latin-euro-standards' didn't provide a Latin 7 language environment!")
(provide 'latin-unity-latin7)
Index: mule-packages/latin-unity/latin-unity-latin8.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/mule-packages/latin-unity/latin-unity-latin8.el,v
retrieving revision 1.2
diff -u -u -r1.2 latin-unity-latin8.el
--- mule-packages/latin-unity/latin-unity-latin8.el 2005/02/15 22:22:47 1.2
+++ mule-packages/latin-unity/latin-unity-latin8.el 2006/06/25 09:33:07
＠＠ -46,16 +46,16 ＠＠
;; Check that we're functionally equivalent to the old latin-unity-latin8.el
;; The character set should exist.
-(assert (charsetp (find-charset 'latin-iso8859-14))
+(assert (charsetp (find-charset 'latin-iso8859-14)) t
"`latin-euro-standards' didn't provide a Latin 8 character set!")
;; As should the coding system.
-(assert (coding-system-p (find-coding-system 'iso-8859-14))
+(assert (coding-system-p (find-coding-system 'iso-8859-14)) t
"`latin-euro-standards' didn't provide a Latin 8 coding system!")
;; And we should have a language environment.
(assert
- (assoc "Latin-8" language-info-alist)
+ (assoc "Latin-8" language-info-alist) t
"`latin-euro-standards' didn't provide a Latin 8 language environment!")
(provide 'latin-unity-latin8)
Index: mule-packages/latin-unity/latin-unity-latin9.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/mule-packages/latin-unity/latin-unity-latin9.el,v
retrieving revision 1.7
diff -u -u -r1.7 latin-unity-latin9.el
--- mule-packages/latin-unity/latin-unity-latin9.el 2005/02/15 22:22:48 1.7
+++ mule-packages/latin-unity/latin-unity-latin9.el 2006/06/25 09:33:07
＠＠ -46,16 +46,16 ＠＠
;; Check that we're functionally equivalent to the old latin-unity-latin9.el
;; The character set should exist.
-(assert (charsetp (find-charset 'latin-iso8859-16))
+(assert (charsetp (find-charset 'latin-iso8859-16)) t
"`latin-euro-standards' didn't provide a Latin 9 character set!")
;; As should the coding system.
-(assert (coding-system-p (find-coding-system 'iso-8859-15))
+(assert (coding-system-p (find-coding-system 'iso-8859-15)) t
"`latin-euro-standards' didn't provide a Latin 9 coding system!")
;; And we should have a language environment.
(assert
- (assoc "Latin-9" language-info-alist)
+ (assoc "Latin-9" language-info-alist) t
"`latin-euro-standards' didn't provide a Latin 9 language environment!")
(provide 'latin-unity-latin9)
--
Santa Maradona, priez pour moi!
- 1 participants
- 0 comments
[PATCH] fix for toolbar-kill-item-pos
18 years, 6 months
Jeff Miller
Jeff Miller
Someone at work asked how to remove a toolbar button, I suggested
using toolbar-kill-item-pos and then found it didn't work. The
toolbar argument is used twice and only tested for nil once.
Also, in trying to clean up the code, someone assumed that setcdr
returned the entire new list. It doesn't, just the new cdr. And that's
what was showing up as the new toolbar.
ChangeLog addition:
2006-06-22 Jeff Miller <jmiller(a)cablespeed.com>
* toolbar-utils.el (toolbar-kill-item-pos): set toolbar to default-toolbar if not
passed as an argument.
Fix wrong usage of setcdr when setting specifier.
toolbar source patch:
Diff command: cvs -q diff -u
Files affected: toolbar-utils.el
Index: toolbar-utils.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/edit-utils/toolbar-utils.el,v
retrieving revision 1.2
diff -u -u -r1.2 toolbar-utils.el
--- toolbar-utils.el 2002/12/12 03:28:33 1.2
+++ toolbar-utils.el 2006/06/23 02:18:33
＠＠ -383,14 +383,14 ＠＠
See also `toolbar-find-button-by-icon', `toolbar-find-button-by-command',
and `toolbar-find-button-by-help-string'."
(setq locale (or locale 'global))
- (let ((spec (cdadar (specifier-spec-list (or toolbar default-toolbar)
- locale))))
+ (setq toolbar (or toolbar default-toolbar))
+ (let ((spec (cdadar (specifier-spec-list toolbar locale))))
(setq button-palette (cons (nth pos spec) button-palette))
- (set-specifier toolbar (if (eq pos 0)
- (cdr spec)
- (setcdr (nthcdr (1- pos) spec)
- (nthcdr (1+ pos) spec)))
- locale)))
+ (if (eq pos 0)
+ (setq spec (cdr spec))
+ (setcdr (nthcdr (1- pos) spec)
+ (nthcdr (1+ pos) spec)))
+ (set-specifier toolbar spec locale)))
;; locating buttons by their content, returning a position
- 2 participants
- 1 comments
[AC21.5] Track "unexpected errors" in test-harness
18 years, 6 months
Stephen J. Turnbull
Stephen J. Turnbull
APPROVE COMMIT 21.5
This patch tracks the unexpected errors which do not get reported as
"failures" by the per file code, and reports the count, as well as the
file(s) where they occurred, in the summary report. Not fully tested,
but it seems to work.
After a bit of consideration, I decided that most of the ones I've
seen are things like missing packages or executables, or the Mac's
funky handling of non-ASCII file names. These really are not failures
of XEmacs proper, and aren't likely to occur in actual practice. So I
think this is appropriate. I'd be happy to entertain arguments that
they should be converted to per-file failures.
Also, the file names that are printed are absolute paths. Personally,
I think that's a good idea; I keep bunches of workspaces around, and
I'm not always in the right one when reading beta.err.
Index: tests/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/tests/ChangeLog,v
retrieving revision 1.80
diff -u -r1.80 ChangeLog
--- tests/ChangeLog 3 Jun 2006 17:51:03 -0000 1.80
+++ tests/ChangeLog 24 Jun 2006 11:37:48 -0000
＠＠ -0,0 +1,4 ＠＠
+2006-06-24 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * automated/test-harness.el: Improve handling of unexpected errors.
+
Index: tests/automated/test-harness.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/tests/automated/test-harness.el,v
retrieving revision 1.20
diff -u -r1.20 test-harness.el
--- tests/automated/test-harness.el 3 May 2004 15:08:51 -0000 1.20
+++ tests/automated/test-harness.el 24 Jun 2006 11:37:49 -0000
＠＠ -45,6 +45,23 ＠＠
(require 'bytecomp)
+(defvar unexpected-test-suite-failures 0
+ "Cumulative number of unexpected failures since test-harness was loaded.
+
+\"Unexpected failures\" are those caught by a generic handler established
+outside of the test context. As such they involve an abort of the test
+suite for the file being tested.
+
+They often occur during preparation of a test or recording of the results.
+For example, an executable used to generate test data might not be present
+on the system, or a system error might occur while reading a data file.")
+
+(defvar unexpected-test-suite-failure-files nil
+ "List of test files causing unexpected failures.")
+
+;; Declared for dynamic scope; _do not_ initialize here.
+(defvar unexpected-test-file-failures)
+
(defvar test-harness-test-compiled nil
"Non-nil means the test code was compiled before execution.")
＠＠ -134,6 +151,7 ＠＠
(setq body (cons (read buffer) body)))
(end-of-file nil)
(error
+ (incf unexpected-test-file-failures)
(princ (format "Unexpected error %S reading forms from buffer\n"
error-info))))
`(lambda ()
＠＠ -144,7 +162,6 ＠＠
(defvar missing-message-failures)
(defvar other-failures)
- (defvar unexpected-test-suite-failure)
(defvar trick-optimizer)
,＠(nreverse body))))
＠＠ -158,6 +175,7 ＠＠
(wrong-error-failures 0)
(missing-message-failures 0)
(other-failures 0)
+ (unexpected-test-file-failures 0)
;; #### perhaps this should be a defvar, and output at the very end
;; OTOH, this way AC types can use a null EMACSPACKAGEPATH to find
＠＠ -165,7 +183,6 ＠＠
(skipped-test-reasons (make-hash-table :test 'equal))
(trick-optimizer nil)
- (unexpected-test-suite-failure nil)
(debug-on-error t)
(pass-stream nil))
(with-output-to-temp-buffer "*Test-Log*"
＠＠ -320,7 +337,7 ＠＠
(condition-case error-info
(funcall (test-harness-read-from-buffer inbuffer))
(error
- (setq unexpected-test-suite-failure t)
+ (incf unexpected-test-file-failures)
(princ (format "Unexpected error %S while executing interpreted code\n"
error-info))
(message "Unexpected error %S while executing interpreted code." error-info)
＠＠ -341,6 +358,7 ＠＠
(condition-case error-info
(if code (funcall code))
(error
+ (incf unexpected-test-file-failures)
(princ (format "Unexpected error %S while executing byte-compiled code\n"
error-info))
(message "Unexpected error %S while executing byte-compiled code." error-info)
＠＠ -383,7 +401,11 ＠＠
(cons (list filename passes total)
test-harness-file-results-alist))
(message "%s" summary-msg))
- (when unexpected-test-suite-failure
+ (when (> unexpected-test-file-failures 0)
+ (setq unexpected-test-suite-failure-files
+ (cons filename unexpected-test-suite-failure-files))
+ (setq unexpected-test-suite-failures
+ (+ unexpected-test-suite-failures unexpected-test-file-failures))
(message "Test suite execution failed unexpectedly."))
(fmakunbound 'Assert)
(fmakunbound 'Check-Error)
＠＠ -510,7 +532,23 ＠＠
(/ (* 100 nsucc) ntest))
(message test-harness-null-summary-template
(concat basename ":")))
- (setq results (cdr results))))))
+ (setq results (cdr results)))))
+ (when (> unexpected-test-suite-failures 0)
+ (message "\n***** There %s %d unexpected test suite %s in %s:"
+ (if (= unexpected-test-suite-failures 1) "was" "were")
+ unexpected-test-suite-failures
+ (if (= unexpected-test-suite-failures 1) "failure" "failures")
+ (if (= (length unexpected-test-suite-failure-files) 1)
+ "file"
+ "files"))
+ (while unexpected-test-suite-failure-files
+ (let ((line (pop unexpected-test-suite-failure-files)))
+ (while (and (< (length line) 61)
+ unexpected-test-suite-failure-files)
+ (setq line
+ (concat line " "
+ (pop unexpected-test-suite-failure-files))))
+ (message line)))))
(message "\nDone")
(kill-emacs (if error 1 0))))
--
Graduate School of Systems and Information Engineering University of Tsukuba
http://turnbull.sk.tsukuba.ac.jp/ Tennodai 1-1-1 Tsukuba 305-8573 JAPAN
Economics of Information Communication and Computation Systems
Experimental Economics, Microeconomic Theory, Game Theory
- 1 participants
- 0 comments