Mercurial > vim

comparison src/os_mswin.c @ 6253:4eba2bdb26f2 v7.4.461

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.4.461 Problem: MS-Windows: When collate is on the number of copies is too high. Solution: Only set the collated/uncollated count when collate is on. (Yasuhiro Matsumoto)
author Bram Moolenaar <bram@vim.org>
date Sat, 27 Sep 2014 11:18:19 +0200
parents 7816c24ff890
children 3005da486a71
comparison
equal deleted inserted replaced
6252:3d9d6241de2b 6253:4eba2bdb26f2
1671 /* 1671 /*
1672 * Fill in the settings struct 1672 * Fill in the settings struct
1673 */ 1673 */
1674 psettings->chars_per_line = prt_get_cpl(); 1674 psettings->chars_per_line = prt_get_cpl();
1675 psettings->lines_per_page = prt_get_lpp(); 1675 psettings->lines_per_page = prt_get_lpp();
1676 psettings->n_collated_copies = (prt_dlg.Flags & PD_COLLATE) 1676 if (prt_dlg.Flags & PD_USEDEVMODECOPIESANDCOLLATE)
1677 ? prt_dlg.nCopies : 1; 1677 {
1678 psettings->n_uncollated_copies = (prt_dlg.Flags & PD_COLLATE) 1678 psettings->n_collated_copies = (prt_dlg.Flags & PD_COLLATE)
1679 ? 1 : prt_dlg.nCopies; 1679 ? prt_dlg.nCopies : 1;
1680 1680 psettings->n_uncollated_copies = (prt_dlg.Flags & PD_COLLATE)
1681 if (psettings->n_collated_copies == 0) 1681 ? 1 : prt_dlg.nCopies;
1682
1683 if (psettings->n_collated_copies == 0)
1684 psettings->n_collated_copies = 1;
1685
1686 if (psettings->n_uncollated_copies == 0)
1687 psettings->n_uncollated_copies = 1;
1688 } else {
1682 psettings->n_collated_copies = 1; 1689 psettings->n_collated_copies = 1;
1683
1684 if (psettings->n_uncollated_copies == 0)
1685 psettings->n_uncollated_copies = 1; 1690 psettings->n_uncollated_copies = 1;
1691 }
1686 1692
1687 psettings->jobname = jobname; 1693 psettings->jobname = jobname;
1688 1694
1689 return TRUE; 1695 return TRUE;
1690 1696