* 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.

diff --git a/src/ChangeLog b/src/ChangeLog
index 9782c83c2e5c06c35973e5cf23e9dbd132bb6be1..da88627c0091292fd236c7eda85c904bc15bf4a0 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,16 @@
+2007-05-26  Dan Nicolaescu  <dann@ics.uci.edu>
+
+       * 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  <mituharu@math.s.chiba-u.ac.jp>
 
        * macterm.c [USE_CARBON_EVENTS] (mac_handle_window_event):

diff --git a/src/ccl.c b/src/ccl.c
index ded74fb6296905b8edaa275f0f9b75f8667200d0..ee0250f6c2c814259202c3771e9e3054f3b4d294 100644 (file)
--- 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 49e1570c4c26948d83d68272e16cca0652231ab2..471df20cd482d3a825f76229d54b84dbcbefe34d 100644 (file)
--- 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 345aa0a35e0baa9b04b65e23324e57d4f0d8d11d..661a3ea1887f6aa08cfde7e8c96c9473a2d778e2 100644 (file)
--- 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 91522eeda7a28339aa66b20b7333e63e955d31db..32abee0bc1015322d177a49b130a6f63085da683 100644 (file)
--- 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 8e920745f3f19a6c5089a45eee9a66946d85e9f5..6420d16686f97f7d9eef9eb2deca54c0bbf1132e 100644 (file)
--- 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 b9190e69fa48a29a46006ef9b2336f7b7768056c..e4a685fae2df3755c3d83d0abe590fb6e71fe265 100644 (file)
--- 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 562f471de36f0d6248350933264a69823790b5de..d61945652533214aa27e9eb56ec8499785813b56 100644 (file)
--- 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 151d99801163497019f5fbffbf6ae0903f3da62c..a5ebe844696174d7349d819870307d91705882a8 100644 (file)
--- 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 b98d10764ce461fbc4cedb26098cccc2820a13c9..07ea34bf736217d67750912c7b950d76ad2b0b7a 100644 (file)
--- 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);