Mercurial > hg > xemacs-beta

comparison src/device-msw.c @ 5468:a9094f28f9a9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with trunk.
author Mats Lidell <matsl@xemacs.org>
date Wed, 19 Jan 2011 22:35:23 +0100
parents 308d34e9f07d 8608eadee6ba
children 56144c8593a8
comparison
equal deleted inserted replaced
5457:4ed2dedf36a1 5468:a9094f28f9a9
1325 /* Strange but... */ 1325 /* Strange but... */
1326 return Qnil; 1326 return Qnil;
1327 1327
1328 GCPRO2 (result, def_printer); 1328 GCPRO2 (result, def_printer);
1329 1329
1330 def_printer = msprinter_default_printer ();
1331
1330 while (num_printers--) 1332 while (num_printers--)
1331 { 1333 {
1332 Extbyte *printer_name; 1334 Extbyte *printer_name;
1335 Lisp_Object printer_name_lisp;
1333 if (have_nt) 1336 if (have_nt)
1334 { 1337 {
1335 PRINTER_INFO_4 *info = (PRINTER_INFO_4 *) data_buf; 1338 PRINTER_INFO_4 *info = (PRINTER_INFO_4 *) data_buf;
1336 printer_name = (Extbyte *) info->pPrinterName; 1339 printer_name = (Extbyte *) info->pPrinterName;
1337 } 1340 }
1339 { 1342 {
1340 PRINTER_INFO_5 *info = (PRINTER_INFO_5 *) data_buf; 1343 PRINTER_INFO_5 *info = (PRINTER_INFO_5 *) data_buf;
1341 printer_name = (Extbyte *) info->pPrinterName; 1344 printer_name = (Extbyte *) info->pPrinterName;
1342 } 1345 }
1343 data_buf += enum_entry_size; 1346 data_buf += enum_entry_size;
1344 1347
1345 result = Fcons (build_tstr_string (printer_name), result); 1348 printer_name_lisp = build_tstr_string (printer_name);
1349 if (0 != qxestrcasecmp (XSTRING_DATA (def_printer),
1350 XSTRING_DATA (printer_name_lisp)))
1351 {
1352 result = Fcons (printer_name_lisp, result);
1353 }
1346 } 1354 }
1347 1355
1348 def_printer = msprinter_default_printer ();
1349 result = Fdelete (def_printer, result);
1350 result = Fcons (def_printer, result); 1356 result = Fcons (def_printer, result);
1351 1357
1352 RETURN_UNGCPRO (result); 1358 RETURN_UNGCPRO (result);
1353 } 1359 }
1354 1360