[Emacs-diffs] emacs/src ChangeLog casetab.c coding.c font.c f...

[Juanma Barranquero]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Juanma Barranquero <lektu>      09/02/11 09:45:15

Modified files:
        src            : ChangeLog casetab.c coding.c font.c fontset.c 
                         ftfont.c xfont.c xftfont.c 

Log message:
        Remove spurious semicolons.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7350&r2=1.7351
http://cvs.savannah.gnu.org/viewcvs/emacs/src/casetab.c?cvsroot=emacs&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/emacs/src/coding.c?cvsroot=emacs&r1=1.413&r2=1.414
http://cvs.savannah.gnu.org/viewcvs/emacs/src/font.c?cvsroot=emacs&r1=1.111&r2=1.112
http://cvs.savannah.gnu.org/viewcvs/emacs/src/fontset.c?cvsroot=emacs&r1=1.155&r2=1.156
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ftfont.c?cvsroot=emacs&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xfont.c?cvsroot=emacs&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xftfont.c?cvsroot=emacs&r1=1.20&r2=1.21

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7350
retrieving revision 1.7351
diff -u -b -r1.7350 -r1.7351
--- ChangeLog   11 Feb 2009 08:44:22 -0000      1.7350
+++ ChangeLog   11 Feb 2009 09:45:12 -0000      1.7351
@@ -1,3 +1,13 @@
+2009-02-11  Juanma Barranquero  <address@hidden>
+
+       * casetab.c (init_casetab_once):
+       * coding.c (ALLOC_CONVERSION_WORK_AREA):
+       * font.c (font_update_lface):
+       * fontset.c (Fnew_fontset):
+       * ftfont.c (ftfont_drive_otf):
+       * xfont.c (xfont_open):
+       * xftfont.c (xftfont_get_xft_draw): Remove spurious semicolons.
+
 2009-02-11  Stefan Monnier  <address@hidden>
 
        * fileio.c (Fwrite_region): !NILP -> CONSP.

Index: casetab.c
===================================================================
RCS file: /sources/emacs/emacs/src/casetab.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- casetab.c   10 Jan 2009 23:04:53 -0000      1.47
+++ casetab.c   11 Feb 2009 09:45:13 -0000      1.48
@@ -285,7 +285,7 @@
     {
       int c = ((i >= 'A' && i <= 'Z') ? i + ('a' - 'A')
               : ((i >= 'a' && i <= 'z') ? i + ('A' - 'a')
-                 : i));;
+                 : i));
       CHAR_TABLE_SET (up, i, make_number (c));
     }
 

Index: coding.c
===================================================================
RCS file: /sources/emacs/emacs/src/coding.c,v
retrieving revision 1.413
retrieving revision 1.414
diff -u -b -r1.413 -r1.414
--- coding.c    9 Feb 2009 00:42:37 -0000       1.413
+++ coding.c    11 Feb 2009 09:45:13 -0000      1.414
@@ -6626,7 +6626,7 @@
 
 #define ALLOC_CONVERSION_WORK_AREA(coding)                             \
   do {                                                                 \
-    int size = CHARBUF_SIZE;;                                          \
+    int size = CHARBUF_SIZE;                                           \
                                                                        \
     coding->charbuf = NULL;                                            \
     while (size > 1024)                                                        
\

Index: font.c
===================================================================
RCS file: /sources/emacs/emacs/src/font.c,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -b -r1.111 -r1.112
--- font.c      5 Feb 2009 06:21:19 -0000       1.111
+++ font.c      11 Feb 2009 09:45:14 -0000      1.112
@@ -3132,7 +3132,7 @@
   if (! NILP (AREF (spec, FONT_WEIGHT_INDEX)))
     attrs[LFACE_WEIGHT_INDEX] = FONT_WEIGHT_FOR_FACE (spec);
   if (! NILP (AREF (spec, FONT_SLANT_INDEX)))
-    attrs[LFACE_SLANT_INDEX] = FONT_SLANT_FOR_FACE (spec);;
+    attrs[LFACE_SLANT_INDEX] = FONT_SLANT_FOR_FACE (spec);
   if (! NILP (AREF (spec, FONT_WIDTH_INDEX)))
     attrs[LFACE_SWIDTH_INDEX] = FONT_WIDTH_FOR_FACE (spec);
   if (! NILP (AREF (spec, FONT_SIZE_INDEX)))

Index: fontset.c
===================================================================
RCS file: /sources/emacs/emacs/src/fontset.c,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -b -r1.155 -r1.156
--- fontset.c   28 Jan 2009 11:50:05 -0000      1.155
+++ fontset.c   11 Feb 2009 09:45:14 -0000      1.156
@@ -1619,7 +1619,7 @@
     }
   else
     {
-      fontset = FONTSET_FROM_ID (id);;
+      fontset = FONTSET_FROM_ID (id);
       free_realized_fontsets (fontset);
       Fset_char_table_range (fontset, Qt, Qnil);
     }

Index: ftfont.c
===================================================================
RCS file: /sources/emacs/emacs/src/ftfont.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- ftfont.c    27 Jan 2009 05:09:42 -0000      1.44
+++ ftfont.c    11 Feb 2009 09:45:14 -0000      1.45
@@ -1778,7 +1778,7 @@
                base_x = otfg->f.f4.base_anchor->XCoordinate * x_scale / 
0x10000;
                base_y = otfg->f.f4.base_anchor->YCoordinate * y_scale / 
0x10000;
                mark_x = otfg->f.f4.mark_anchor->XCoordinate * x_scale / 
0x10000;
-               mark_y = otfg->f.f4.mark_anchor->YCoordinate * y_scale / 
0x10000;;
+               mark_y = otfg->f.f4.mark_anchor->YCoordinate * y_scale / 
0x10000;
 
                if (otfg->f.f4.base_anchor->AnchorFormat != 1)
                  adjust_anchor (ft_face, otfg->f.f4.base_anchor,

Index: xfont.c
===================================================================
RCS file: /sources/emacs/emacs/src/xfont.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- xfont.c     8 Jan 2009 03:16:11 -0000       1.22
+++ xfont.c     11 Feb 2009 09:45:14 -0000      1.23
@@ -642,7 +642,7 @@
       char *p0, *p;
       int dashes = 0;
 
-      p0 = p = (char *) XGetAtomName (FRAME_X_DISPLAY (f), (Atom) value);;
+      p0 = p = (char *) XGetAtomName (FRAME_X_DISPLAY (f), (Atom) value);
       /* Count the number of dashes in the "full name".
         If it is too few, this isn't really the font's full name,
         so don't use it.

Index: xftfont.c
===================================================================
RCS file: /sources/emacs/emacs/src/xftfont.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- xftfont.c   29 Jan 2009 12:13:47 -0000      1.20
+++ xftfont.c   11 Feb 2009 09:45:14 -0000      1.21
@@ -523,7 +523,7 @@
 xftfont_get_xft_draw (f)
      FRAME_PTR f;
 {
-  XftDraw *xft_draw = font_get_frame_data (f, &xftfont_driver);;
+  XftDraw *xft_draw = font_get_frame_data (f, &xftfont_driver);
 
   if (! xft_draw)
     {