diff options
| author | Bram Moolenaar <Bram@vim.org> | 2014-09-27 11:18:19 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2014-09-27 11:18:19 +0200 |
| commit | 7ddc642a0c786f834ab0b6851b80dbed6e04204b (patch) | |
| tree | fc5e270c7bc137432d30b3496a235e062212b7db /src | |
| parent | da014b94417a6e270787704d24c2cd735bc83e38 (diff) | |
| download | vim-git-7ddc642a0c786f834ab0b6851b80dbed6e04204b.tar.gz | |
updated for version 7.4.461v7.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)
Diffstat (limited to 'src')
| -rw-r--r-- | src/os_mswin.c | 20 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 15 insertions, 7 deletions
diff --git a/src/os_mswin.c b/src/os_mswin.c index 8ad3695bd..9151aef41 100644 --- a/src/os_mswin.c +++ b/src/os_mswin.c @@ -1673,16 +1673,22 @@ mch_print_init(prt_settings_T *psettings, char_u *jobname, int forceit) */ 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 (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_collated_copies == 0) + psettings->n_collated_copies = 1; - if (psettings->n_uncollated_copies == 0) + if (psettings->n_uncollated_copies == 0) + psettings->n_uncollated_copies = 1; + } else { + psettings->n_collated_copies = 1; psettings->n_uncollated_copies = 1; + } psettings->jobname = jobname; diff --git a/src/version.c b/src/version.c index 4c5324a63..d0847ad7e 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 461, +/**/ 460, /**/ 459, |