Module Name: xsrc
Committed By: wiz
Date: Mon Jul 20 08:20:04 UTC 2015
Modified Files:
xsrc/external/mit/xman/dist: handler.c
Log Message:
Fix mismerge.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xman/dist/handler.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xman/dist/handler.c
diff -u xsrc/external/mit/xman/dist/handler.c:1.5 xsrc/external/mit/xman/dist/handler.c:1.6
--- xsrc/external/mit/xman/dist/handler.c:1.5 Sun Jul 19 23:04:04 2015
+++ xsrc/external/mit/xman/dist/handler.c Mon Jul 20 08:20:04 2015
@@ -320,7 +320,7 @@ SaveFormattedPage(Widget w, XEvent * eve
* If we are not active then take no action.
*/
- if (man_globals->tempfile == NULL || man_globals->tempfile[0] == '\0')
+ if (man_globals->tempfile[0] == '\0')
return;
switch (params[0][0]) {
