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)

diff --git a/src/os_mswin.c b/src/os_mswin.c
index 8ad3695bd4ed6834dae47e7fd0389e44b5913b5e..9151aef4147ae320246a7d49d75fc3294f922bdd 100644 (file)
--- 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 4c5324a63db11707bf23c65c5e09ec4397c40aa3..d0847ad7e51b1f683ed1e35b6794e159803cd85c 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    461,
 /**/
     460,
 /**/