diff --git a/ChangeLog b/ChangeLog
index f81d6509e..eaac2d854 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,15 @@
+2011-06-25  Robert Larice
+ * src/frontend/plotting/graf.c :
+   graf.c, swallow type conversion warning
+
 2011-06-25 Holger Vogt
  * main.c, defines.h: improved shutdown message for Windows GUI
  * cpitf.c, ngspice.h, ivars.c, ivars.h, analog/file_source/cfunc.mod:
-   Add reading an environmental variable NGSPICE_INPUT to hold a path 
+   Add reading an environmental variable NGSPICE_INPUT to hold a path
    where input files are searched for (in addition to existing search paths),
-   e.g. *.cir in -b and interactive mode, include and library files, 
+   e.g. *.cir in -b and interactive mode, include and library files,
    filesource input file.
-   
+
 2011-06-24  Robert Larice
  * src/main.c ,
  * src/frontend/com_ahelp.c ,
diff --git a/src/frontend/plotting/graf.c b/src/frontend/plotting/graf.c
index dc4e5b18e..006e3ae03 100644
--- a/src/frontend/plotting/graf.c
+++ b/src/frontend/plotting/graf.c
@@ -34,7 +34,7 @@ $Id$
 /* static declarations */
 static void gr_start_internal(struct dvec *dv, bool copyvec);
 static int iplot(struct plot *pl, int id);
-static void set(struct plot *plot, struct dbcomm *db, bool unset, int mode);
+static void set(struct plot *plot, struct dbcomm *db, bool unset, short mode);
 static char * getitright(char *buf, double num);
 
 /* for legends, set in gr_start, reset in gr_iplot and gr_init */
@@ -815,7 +815,7 @@ iplot(struct plot *pl, int id)
 }
 
 static void
-set(struct plot *plot, struct dbcomm *db, bool unset, int mode)
+set(struct plot *plot, struct dbcomm *db, bool unset, short mode)
 {
 
     struct dvec *v;
@@ -824,7 +824,7 @@ set(struct plot *plot, struct dbcomm *db, bool unset, int mode)
     if (db->db_type == DB_IPLOTALL || db->db_type == DB_TRACEALL) {
       for (v = plot->pl_dvecs; v; v = v->v_next) {
         if (unset)
-          v->v_flags &= ~mode;
+          v->v_flags &= (short) ~mode;
         else
           v->v_flags |= mode;
       }
@@ -841,7 +841,7 @@ set(struct plot *plot, struct dbcomm *db, bool unset, int mode)
           continue;
         }
         if (unset)
-          v->v_flags &= ~mode;
+          v->v_flags &= (short) ~mode;
         else
           v->v_flags |= mode;
     }