|
 |
3ef2ca |
To: vim_dev@googlegroups.com
|
|
|
3ef2ca |
Subject: Patch 7.4.461
|
|
|
3ef2ca |
Fcc: outbox
|
|
|
3ef2ca |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
3ef2ca |
Mime-Version: 1.0
|
|
|
3ef2ca |
Content-Type: text/plain; charset=UTF-8
|
|
|
3ef2ca |
Content-Transfer-Encoding: 8bit
|
|
|
3ef2ca |
------------
|
|
|
3ef2ca |
|
|
|
3ef2ca |
Patch 7.4.461
|
|
|
3ef2ca |
Problem: MS-Windows: When collate is on the number of copies is too high.
|
|
|
3ef2ca |
Solution: Only set the collated/uncollated count when collate is on.
|
|
|
3ef2ca |
(Yasuhiro Matsumoto)
|
|
|
3ef2ca |
Files: src/os_mswin.c
|
|
|
3ef2ca |
|
|
|
3ef2ca |
|
|
|
3ef2ca |
*** ../vim-7.4.460/src/os_mswin.c 2014-09-23 21:53:35.306849352 +0200
|
|
|
3ef2ca |
--- src/os_mswin.c 2014-09-27 11:14:27.287520497 +0200
|
|
|
3ef2ca |
***************
|
|
|
3ef2ca |
*** 1673,1688 ****
|
|
|
3ef2ca |
*/
|
|
|
3ef2ca |
psettings->chars_per_line = prt_get_cpl();
|
|
|
3ef2ca |
psettings->lines_per_page = prt_get_lpp();
|
|
|
3ef2ca |
! psettings->n_collated_copies = (prt_dlg.Flags & PD_COLLATE)
|
|
|
3ef2ca |
! ? prt_dlg.nCopies : 1;
|
|
|
3ef2ca |
! psettings->n_uncollated_copies = (prt_dlg.Flags & PD_COLLATE)
|
|
|
3ef2ca |
! ? 1 : prt_dlg.nCopies;
|
|
|
3ef2ca |
|
|
|
3ef2ca |
! if (psettings->n_collated_copies == 0)
|
|
|
3ef2ca |
! psettings->n_collated_copies = 1;
|
|
|
3ef2ca |
|
|
|
3ef2ca |
! if (psettings->n_uncollated_copies == 0)
|
|
|
3ef2ca |
psettings->n_uncollated_copies = 1;
|
|
|
3ef2ca |
|
|
|
3ef2ca |
psettings->jobname = jobname;
|
|
|
3ef2ca |
|
|
|
3ef2ca |
--- 1673,1694 ----
|
|
|
3ef2ca |
*/
|
|
|
3ef2ca |
psettings->chars_per_line = prt_get_cpl();
|
|
|
3ef2ca |
psettings->lines_per_page = prt_get_lpp();
|
|
|
3ef2ca |
! if (prt_dlg.Flags & PD_USEDEVMODECOPIESANDCOLLATE)
|
|
|
3ef2ca |
! {
|
|
|
3ef2ca |
! psettings->n_collated_copies = (prt_dlg.Flags & PD_COLLATE)
|
|
|
3ef2ca |
! ? prt_dlg.nCopies : 1;
|
|
|
3ef2ca |
! psettings->n_uncollated_copies = (prt_dlg.Flags & PD_COLLATE)
|
|
|
3ef2ca |
! ? 1 : prt_dlg.nCopies;
|
|
|
3ef2ca |
|
|
|
3ef2ca |
! if (psettings->n_collated_copies == 0)
|
|
|
3ef2ca |
! psettings->n_collated_copies = 1;
|
|
|
3ef2ca |
|
|
|
3ef2ca |
! if (psettings->n_uncollated_copies == 0)
|
|
|
3ef2ca |
! psettings->n_uncollated_copies = 1;
|
|
|
3ef2ca |
! } else {
|
|
|
3ef2ca |
! psettings->n_collated_copies = 1;
|
|
|
3ef2ca |
psettings->n_uncollated_copies = 1;
|
|
|
3ef2ca |
+ }
|
|
|
3ef2ca |
|
|
|
3ef2ca |
psettings->jobname = jobname;
|
|
|
3ef2ca |
|
|
|
3ef2ca |
*** ../vim-7.4.460/src/version.c 2014-09-24 13:26:39.954971642 +0200
|
|
|
3ef2ca |
--- src/version.c 2014-09-27 11:16:48.883520806 +0200
|
|
|
3ef2ca |
***************
|
|
|
3ef2ca |
*** 743,744 ****
|
|
|
3ef2ca |
--- 743,746 ----
|
|
|
3ef2ca |
{ /* Add new patch number below this line */
|
|
|
3ef2ca |
+ /**/
|
|
|
3ef2ca |
+ 461,
|
|
|
3ef2ca |
/**/
|
|
|
3ef2ca |
|
|
|
3ef2ca |
--
|
|
|
3ef2ca |
hundred-and-one symptoms of being an internet addict:
|
|
|
3ef2ca |
188. You purchase a laptop so you can surf while sitting on the can.
|
|
|
3ef2ca |
|
|
|
3ef2ca |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
3ef2ca |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
3ef2ca |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
3ef2ca |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|