aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-29 04:34:16 -04:00
Code Activity

updated for version 7.4.461

Browse Source 
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)
This commit is contained in:
Bram Moolenaar
2014-09-27 11:18:19 +02:00
parent da014b9441
commit 7ddc642a0c
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/os_mswin.c
View File

@@ -1673,6 +1673,8 @@ mch_print_init(prt_settings_T *psettings, char_u *jobname, int forceit)
*/ */
psettings->chars_per_line = prt_get_cpl(); psettings->chars_per_line = prt_get_cpl();
psettings->lines_per_page = prt_get_lpp(); psettings->lines_per_page = prt_get_lpp();
if (prt_dlg.Flags & PD_USEDEVMODECOPIESANDCOLLATE)
{
psettings->n_collated_copies = (prt_dlg.Flags & PD_COLLATE) psettings->n_collated_copies = (prt_dlg.Flags & PD_COLLATE)
? prt_dlg.nCopies : 1; ? prt_dlg.nCopies : 1;
psettings->n_uncollated_copies = (prt_dlg.Flags & PD_COLLATE) psettings->n_uncollated_copies = (prt_dlg.Flags & PD_COLLATE)
@@ -1683,6 +1685,10 @@ mch_print_init(prt_settings_T *psettings, char_u *jobname, int forceit)
if (psettings->n_uncollated_copies == 0) if (psettings->n_uncollated_copies == 0)
psettings->n_uncollated_copies = 1; psettings->n_uncollated_copies = 1;
} else {
psettings->n_collated_copies = 1;
psettings->n_uncollated_copies = 1;
}
psettings->jobname = jobname; psettings->jobname = jobname;

2
src/version.c
View File

@@ -741,6 +741,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
461,
/**/ /**/
460, 460,
/**/ /**/