Mercurial > vim
changeset 6253:4eba2bdb26f2 v7.4.461
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 | 3d9d6241de2b |
| children | 1b74025a66e7 |
| files | src/os_mswin.c src/version.c |
| diffstat | 2 files changed, 16 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/os_mswin.c +++ b/src/os_mswin.c @@ -1673,16 +1673,22 @@ mch_print_init(prt_settings_T *psettings */ psettings->chars_per_line = prt_get_cpl(); psettings->lines_per_page = prt_get_lpp(); - psettings->n_collated_copies = (prt_dlg.Flags & PD_COLLATE) - ? prt_dlg.nCopies : 1; - psettings->n_uncollated_copies = (prt_dlg.Flags & PD_COLLATE) - ? 1 : prt_dlg.nCopies; - - if (psettings->n_collated_copies == 0) + if (prt_dlg.Flags & PD_USEDEVMODECOPIESANDCOLLATE) + { + psettings->n_collated_copies = (prt_dlg.Flags & PD_COLLATE) + ? prt_dlg.nCopies : 1; + psettings->n_uncollated_copies = (prt_dlg.Flags & PD_COLLATE) + ? 1 : prt_dlg.nCopies; + + if (psettings->n_collated_copies == 0) + psettings->n_collated_copies = 1; + + if (psettings->n_uncollated_copies == 0) + psettings->n_uncollated_copies = 1; + } else { psettings->n_collated_copies = 1; - - if (psettings->n_uncollated_copies == 0) psettings->n_uncollated_copies = 1; + } psettings->jobname = jobname;