[Monetdb-checkins] buildtools/Mx Display.c, MonetDB_1-22, 1.7.2.2, 1.7.2.3 Form.c, MonetDB_1-22, 1.6.2.2, 1.6.2.3 Io.c, MonetDB_1-22, 1.8.2.2, 1.8.2.3 Mx.c, MonetDB_1-22, 1.7.2.2, 1.7.2.3 Mx.h, MonetDB_1-22, 1.7.2.2, 1.7.2.3

[Niels Nes]

Update of /cvsroot/monetdb/buildtools/Mx
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv11455

Modified Files:
      Tag: MonetDB_1-22
        Display.c Form.c Io.c Mx.c Mx.h 
Log Message:
only output @bye in texi mode


Index: Io.c
===================================================================
RCS file: /cvsroot/monetdb/buildtools/Mx/Io.c,v
retrieving revision 1.8.2.2
retrieving revision 1.8.2.3
diff -u -d -r1.8.2.2 -r1.8.2.3
--- Io.c        6 Feb 2008 12:57:30 -0000       1.8.2.2
+++ Io.c        6 Feb 2008 17:11:54 -0000       1.8.2.3
@@ -221,7 +221,7 @@
        File *f;
 
        if (ofile) {
-               if (bodymode == 0)
+               if (TEXIMODE && bodymode == 0) 
                        ofile_printf("@bye\n");
                fclose(ofile);
        }

Index: Display.c
===================================================================
RCS file: /cvsroot/monetdb/buildtools/Mx/Display.c,v
retrieving revision 1.7.2.2
retrieving revision 1.7.2.3
diff -u -d -r1.7.2.2 -r1.7.2.3
--- Display.c   6 Feb 2008 12:57:30 -0000       1.7.2.2
+++ Display.c   6 Feb 2008 17:11:53 -0000       1.7.2.3
@@ -26,7 +26,6 @@
 
 extern int pr_env;
 
-#define TEXIMODE (textmode==M_TEXI)
 /* Printing modes
  *     Formatted text  Plain/Math.
  *             Math is used for special symbols.
@@ -167,6 +166,6 @@
 PrPostlude(void)
 {
        PrEnv(E_CMD);
-       if (bodymode == 0)
+       if (TEXIMODE && bodymode == 0) 
                ofile_printf("@bye\n");
 }

Index: Mx.h
===================================================================
RCS file: /cvsroot/monetdb/buildtools/Mx/Mx.h,v
retrieving revision 1.7.2.2
retrieving revision 1.7.2.3
diff -u -d -r1.7.2.2 -r1.7.2.3
--- Mx.h        6 Feb 2008 12:57:30 -0000       1.7.2.2
+++ Mx.h        6 Feb 2008 17:11:54 -0000       1.7.2.3
@@ -129,6 +129,8 @@
 
 #define        M_TEXI  0xf0000
 
+#define TEXIMODE (textmode==M_TEXI)
+
 extern int mode;
 
 /* 

Index: Mx.c
===================================================================
RCS file: /cvsroot/monetdb/buildtools/Mx/Mx.c,v
retrieving revision 1.7.2.2
retrieving revision 1.7.2.3
diff -u -d -r1.7.2.2 -r1.7.2.3
--- Mx.c        6 Feb 2008 12:57:30 -0000       1.7.2.2
+++ Mx.c        6 Feb 2008 17:11:54 -0000       1.7.2.3
@@ -33,7 +33,7 @@
 int archived;                  /* set for archived portions */
 int mode = M_TEXT;
 int opt_hide = NO_HIDE;
-int textmode = M_TEXI;
+int textmode = M_TEXT;
 int bodymode = 0;              /* all should be shown */
 char *opt_code;
 char *defHideText = 0;

Index: Form.c
===================================================================
RCS file: /cvsroot/monetdb/buildtools/Mx/Form.c,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -u -d -r1.6.2.2 -r1.6.2.3
--- Form.c      6 Feb 2008 12:57:30 -0000       1.6.2.2
+++ Form.c      6 Feb 2008 17:11:53 -0000       1.6.2.3
@@ -25,7 +25,6 @@
 #include       "Mx.h"
 #include       "MxFcnDef.h"
 
-#define TEXIMODE       (textmode==M_TEXI)
 #define Newline                if TEXIMODE {PrCmd("\n");} 
 
 extern int pr_env;


-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-checkins mailing list
Monetdb-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins