From 3b8c0c70a77c4f580672552b796f46ac07e65867 Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Sat, 26 May 2007 17:21:14 +0000 Subject: [PATCH] * xfaces.c (syms_of_xfaces): Delete stray semicolon. * xdisp.c (next_element_from_buffer): * window.c (delete_window): * term.c (term_mouse_highlight): * msdos.c (getdefdir): * macterm.c (mac_create_bitmap_from_bitmap_data) (init_font_name_table): * fns.c (Fsxhash): * data.c (Fmake_local_variable): * ccl.c (ccl_driver): Likewise. --- src/ChangeLog | 13 +++++++++++++ src/ccl.c | 2 +- src/data.c | 2 +- src/fns.c | 2 +- src/macterm.c | 4 ++-- src/msdos.c | 4 ++-- src/term.c | 2 +- src/window.c | 2 +- src/xdisp.c | 2 +- src/xfaces.c | 2 +- 10 files changed, 24 insertions(+), 11 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 9782c83c2e5..da88627c009 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,16 @@ +2007-05-26 Dan Nicolaescu + + * xfaces.c (syms_of_xfaces): Delete stray semicolon. + * xdisp.c (next_element_from_buffer): + * window.c (delete_window): + * term.c (term_mouse_highlight): + * msdos.c (getdefdir): + * macterm.c (mac_create_bitmap_from_bitmap_data) + (init_font_name_table): + * fns.c (Fsxhash): + * data.c (Fmake_local_variable): + * ccl.c (ccl_driver): Likewise. + 2007-05-24 YAMAMOTO Mitsuharu * macterm.c [USE_CARBON_EVENTS] (mac_handle_window_event): diff --git a/src/ccl.c b/src/ccl.c index ded74fb6296..ee0250f6c2c 100644 --- a/src/ccl.c +++ b/src/ccl.c @@ -1261,7 +1261,7 @@ ccl_driver (ccl, source, destination, src_bytes, dst_bytes, consumed) case CCL_MOD: reg[rrr] = i % j; break; case CCL_AND: reg[rrr] = i & j; break; case CCL_OR: reg[rrr] = i | j; break; - case CCL_XOR: reg[rrr] = i ^ j;; break; + case CCL_XOR: reg[rrr] = i ^ j; break; case CCL_LSH: reg[rrr] = i << j; break; case CCL_RSH: reg[rrr] = i >> j; break; case CCL_LSH8: reg[rrr] = (i << 8) | j; break; diff --git a/src/data.c b/src/data.c index 49e1570c4c2..471df20cd48 100644 --- a/src/data.c +++ b/src/data.c @@ -1575,7 +1575,7 @@ Instead, use `add-hook' and specify t for the LOCAL argument. */) XBUFFER_LOCAL_VALUE (newval)->found_for_frame = 0; XBUFFER_LOCAL_VALUE (newval)->check_frame = 0; XBUFFER_LOCAL_VALUE (newval)->cdr = tem; - SET_SYMBOL_VALUE (variable, newval);; + SET_SYMBOL_VALUE (variable, newval); } /* Make sure this buffer has its own value of symbol. */ tem = Fassq (variable, current_buffer->local_var_alist); diff --git a/src/fns.c b/src/fns.c index 345aa0a35e0..661a3ea1887 100644 --- a/src/fns.c +++ b/src/fns.c @@ -5212,7 +5212,7 @@ DEFUN ("sxhash", Fsxhash, Ssxhash, 1, 1, 0, (obj) Lisp_Object obj; { - unsigned hash = sxhash (obj, 0);; + unsigned hash = sxhash (obj, 0); return make_number (hash); } diff --git a/src/macterm.c b/src/macterm.c index 91522eeda7a..32abee0bc10 100644 --- a/src/macterm.c +++ b/src/macterm.c @@ -734,7 +734,7 @@ mac_create_bitmap_from_bitmap_data (bitmap, bits, w, h) /* Bitswap XBM bytes to match how Mac does things. */ unsigned char c = *bits++; *p++ = (unsigned char)((swap_nibble[c & 0xf] << 4) - | (swap_nibble[(c>>4) & 0xf]));; + | (swap_nibble[(c>>4) & 0xf])); } } @@ -7558,7 +7558,7 @@ init_font_name_table () make_hash_table (Qequal, make_number (DEFAULT_HASH_SIZE), make_float (DEFAULT_REHASH_SIZE), make_float (DEFAULT_REHASH_THRESHOLD), - Qnil, Qnil, Qnil);; + Qnil, Qnil, Qnil); h = XHASH_TABLE (atsu_font_id_hash); err = ATSUFontCount (&nfonts); diff --git a/src/msdos.c b/src/msdos.c index 8e920745f3f..6420d16686f 100644 --- a/src/msdos.c +++ b/src/msdos.c @@ -1584,7 +1584,7 @@ IT_note_mouse_highlight (struct frame *f, int x, int y) { extern Lisp_Object Qmouse_face; Lisp_Object mouse_face, overlay, position, *overlay_vec; - int noverlays, obegv, ozv;; + int noverlays, obegv, ozv; struct buffer *obuf; /* If we get an out-of-range value, return now; avoid an error. */ @@ -4071,7 +4071,7 @@ getdefdir (drive, dst) int drive; char *dst; { - char in_path[4], *p = in_path, e = errno;; + char in_path[4], *p = in_path, e = errno; /* Generate "X:." (when drive is X) or "." (when drive is 0). */ if (drive != 0) diff --git a/src/term.c b/src/term.c index b9190e69fa4..e4a685fae2d 100644 --- a/src/term.c +++ b/src/term.c @@ -2625,7 +2625,7 @@ term_mouse_highlight (struct frame *f, int x, int y) { extern Lisp_Object Qmouse_face; Lisp_Object mouse_face, overlay, position, *overlay_vec; - int noverlays, obegv, ozv;; + int noverlays, obegv, ozv; struct buffer *obuf; /* If we get an out-of-range value, return now; avoid an error. */ diff --git a/src/window.c b/src/window.c index 562f471de36..d6194565253 100644 --- a/src/window.c +++ b/src/window.c @@ -1532,7 +1532,7 @@ delete_window (window) if (!EQ (window, pwindow)) break; /* Otherwise, try another window for SWINDOW. */ - swindow = Fnext_window (swindow, Qlambda, Qnil);; + swindow = Fnext_window (swindow, Qlambda, Qnil); /* If we get back to the frame's selected window, it means there was no acceptable alternative, diff --git a/src/xdisp.c b/src/xdisp.c index 151d9980116..a5ebe844696 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -6269,7 +6269,7 @@ next_element_from_buffer (it) it->c = *p, it->len = 1; /* Record what we have and where it came from. */ - it->what = IT_CHARACTER;; + it->what = IT_CHARACTER; it->object = it->w->buffer; it->position = it->current.pos; diff --git a/src/xfaces.c b/src/xfaces.c index b98d10764ce..07ea34bf736 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -7987,7 +7987,7 @@ syms_of_xfaces () staticpro (&QCforeground); QCbackground = intern (":background"); staticpro (&QCbackground); - QCstipple = intern (":stipple");; + QCstipple = intern (":stipple"); staticpro (&QCstipple); QCwidth = intern (":width"); staticpro (&QCwidth); -- 2.39.2