Mon Jul 20 08:20:04 2015 UTC ()
Fix mismerge.


(wiz)
diff -r1.5 -r1.6 xsrc/external/mit/xman/dist/handler.c

cvs diff -r1.5 -r1.6 xsrc/external/mit/xman/dist/handler.c (expand / switch to unified diff)

--- xsrc/external/mit/xman/dist/handler.c 2015/07/19 23:04:04 1.5
+++ xsrc/external/mit/xman/dist/handler.c 2015/07/20 08:20:04 1.6
@@ -310,27 +310,27 @@ SaveFormattedPage(Widget w, XEvent * eve @@ -310,27 +310,27 @@ SaveFormattedPage(Widget w, XEvent * eve
310 310
311 if (*num_params != 1) { 311 if (*num_params != 1) {
312 XtAppWarning(XtWidgetToApplicationContext(w), 312 XtAppWarning(XtWidgetToApplicationContext(w),
313 "Xman - SaveFormattedPage: This action routine requires one argument."); 313 "Xman - SaveFormattedPage: This action routine requires one argument.");
314 return; 314 return;
315 } 315 }
316 316
317 man_globals = GetGlobals(w); 317 man_globals = GetGlobals(w);
318 318
319/* 319/*
320 * If we are not active then take no action. 320 * If we are not active then take no action.
321 */ 321 */
322 322
323 if (man_globals->tempfile == NULL || man_globals->tempfile[0] == '\0') 323 if (man_globals->tempfile[0] == '\0')
324 return; 324 return;
325 325
326 switch (params[0][0]) { 326 switch (params[0][0]) {
327 case 'S': 327 case 'S':
328 case 's': 328 case 's':
329 329
330#ifndef NO_COMPRESS 330#ifndef NO_COMPRESS
331 if (!man_globals->compress) 331 if (!man_globals->compress)
332#endif 332#endif
333 333
334 snprintf(cmdbuf, sizeof(cmdbuf), "%s %s %s", COPY, 334 snprintf(cmdbuf, sizeof(cmdbuf), "%s %s %s", COPY,
335 man_globals->tempfile, man_globals->save_file); 335 man_globals->tempfile, man_globals->save_file);
336 336