|
 |
e0d4ba5 |
To: vim_dev@googlegroups.com
|
|
|
e0d4ba5 |
Subject: Patch 7.3.077
|
|
|
e0d4ba5 |
Fcc: outbox
|
|
|
e0d4ba5 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
e0d4ba5 |
Mime-Version: 1.0
|
|
|
e0d4ba5 |
Content-Type: text/plain; charset=UTF-8
|
|
|
e0d4ba5 |
Content-Transfer-Encoding: 8bit
|
|
|
e0d4ba5 |
------------
|
|
|
e0d4ba5 |
|
|
|
e0d4ba5 |
Patch 7.3.077
|
|
|
e0d4ba5 |
Problem: When updating crypt of swapfile fails there is no error message.
|
|
|
e0d4ba5 |
(Carlo Teubner)
|
|
|
e0d4ba5 |
Solution: Add the error message.
|
|
|
e0d4ba5 |
Files: src/memline.c
|
|
|
e0d4ba5 |
|
|
|
e0d4ba5 |
|
|
|
e0d4ba5 |
*** ../vim-7.3.076/src/memline.c 2010-08-15 21:57:31.000000000 +0200
|
|
|
e0d4ba5 |
--- src/memline.c 2010-12-08 12:39:10.000000000 +0100
|
|
|
e0d4ba5 |
***************
|
|
|
e0d4ba5 |
*** 582,587 ****
|
|
|
e0d4ba5 |
--- 582,590 ----
|
|
|
e0d4ba5 |
idx = ip->ip_index + 1; /* go to next index */
|
|
|
e0d4ba5 |
page_count = 1;
|
|
|
e0d4ba5 |
}
|
|
|
e0d4ba5 |
+
|
|
|
e0d4ba5 |
+ if (error > 0)
|
|
|
e0d4ba5 |
+ EMSG(_("E843: Error while updating swap file crypt"));
|
|
|
e0d4ba5 |
}
|
|
|
e0d4ba5 |
|
|
|
e0d4ba5 |
mfp->mf_old_key = NULL;
|
|
|
e0d4ba5 |
***************
|
|
|
e0d4ba5 |
*** 2384,2390 ****
|
|
|
e0d4ba5 |
* Make a copy of the line if necessary.
|
|
|
e0d4ba5 |
*/
|
|
|
e0d4ba5 |
/*
|
|
|
e0d4ba5 |
! * get a pointer to a (read-only copy of a) line
|
|
|
e0d4ba5 |
*
|
|
|
e0d4ba5 |
* On failure an error message is given and IObuff is returned (to avoid
|
|
|
e0d4ba5 |
* having to check for error everywhere).
|
|
|
e0d4ba5 |
--- 2387,2393 ----
|
|
|
e0d4ba5 |
* Make a copy of the line if necessary.
|
|
|
e0d4ba5 |
*/
|
|
|
e0d4ba5 |
/*
|
|
|
e0d4ba5 |
! * Return a pointer to a (read-only copy of a) line.
|
|
|
e0d4ba5 |
*
|
|
|
e0d4ba5 |
* On failure an error message is given and IObuff is returned (to avoid
|
|
|
e0d4ba5 |
* having to check for error everywhere).
|
|
|
e0d4ba5 |
***************
|
|
|
e0d4ba5 |
*** 2397,2403 ****
|
|
|
e0d4ba5 |
}
|
|
|
e0d4ba5 |
|
|
|
e0d4ba5 |
/*
|
|
|
e0d4ba5 |
! * ml_get_pos: get pointer to position 'pos'
|
|
|
e0d4ba5 |
*/
|
|
|
e0d4ba5 |
char_u *
|
|
|
e0d4ba5 |
ml_get_pos(pos)
|
|
|
e0d4ba5 |
--- 2400,2406 ----
|
|
|
e0d4ba5 |
}
|
|
|
e0d4ba5 |
|
|
|
e0d4ba5 |
/*
|
|
|
e0d4ba5 |
! * Return pointer to position "pos".
|
|
|
e0d4ba5 |
*/
|
|
|
e0d4ba5 |
char_u *
|
|
|
e0d4ba5 |
ml_get_pos(pos)
|
|
|
e0d4ba5 |
***************
|
|
|
e0d4ba5 |
*** 2407,2413 ****
|
|
|
e0d4ba5 |
}
|
|
|
e0d4ba5 |
|
|
|
e0d4ba5 |
/*
|
|
|
e0d4ba5 |
! * ml_get_curline: get pointer to cursor line.
|
|
|
e0d4ba5 |
*/
|
|
|
e0d4ba5 |
char_u *
|
|
|
e0d4ba5 |
ml_get_curline()
|
|
|
e0d4ba5 |
--- 2410,2416 ----
|
|
|
e0d4ba5 |
}
|
|
|
e0d4ba5 |
|
|
|
e0d4ba5 |
/*
|
|
|
e0d4ba5 |
! * Return pointer to cursor line.
|
|
|
e0d4ba5 |
*/
|
|
|
e0d4ba5 |
char_u *
|
|
|
e0d4ba5 |
ml_get_curline()
|
|
|
e0d4ba5 |
***************
|
|
|
e0d4ba5 |
*** 2416,2422 ****
|
|
|
e0d4ba5 |
}
|
|
|
e0d4ba5 |
|
|
|
e0d4ba5 |
/*
|
|
|
e0d4ba5 |
! * ml_get_cursor: get pointer to cursor position
|
|
|
e0d4ba5 |
*/
|
|
|
e0d4ba5 |
char_u *
|
|
|
e0d4ba5 |
ml_get_cursor()
|
|
|
e0d4ba5 |
--- 2419,2425 ----
|
|
|
e0d4ba5 |
}
|
|
|
e0d4ba5 |
|
|
|
e0d4ba5 |
/*
|
|
|
e0d4ba5 |
! * Return pointer to cursor position.
|
|
|
e0d4ba5 |
*/
|
|
|
e0d4ba5 |
char_u *
|
|
|
e0d4ba5 |
ml_get_cursor()
|
|
|
e0d4ba5 |
***************
|
|
|
e0d4ba5 |
*** 2426,2432 ****
|
|
|
e0d4ba5 |
}
|
|
|
e0d4ba5 |
|
|
|
e0d4ba5 |
/*
|
|
|
e0d4ba5 |
! * get a pointer to a line in a specific buffer
|
|
|
e0d4ba5 |
*
|
|
|
e0d4ba5 |
* "will_change": if TRUE mark the buffer dirty (chars in the line will be
|
|
|
e0d4ba5 |
* changed)
|
|
|
e0d4ba5 |
--- 2429,2435 ----
|
|
|
e0d4ba5 |
}
|
|
|
e0d4ba5 |
|
|
|
e0d4ba5 |
/*
|
|
|
e0d4ba5 |
! * Return a pointer to a line in a specific buffer
|
|
|
e0d4ba5 |
*
|
|
|
e0d4ba5 |
* "will_change": if TRUE mark the buffer dirty (chars in the line will be
|
|
|
e0d4ba5 |
* changed)
|
|
|
e0d4ba5 |
*** ../vim-7.3.076/src/version.c 2010-12-08 13:11:15.000000000 +0100
|
|
|
e0d4ba5 |
--- src/version.c 2010-12-08 13:15:44.000000000 +0100
|
|
|
e0d4ba5 |
***************
|
|
|
e0d4ba5 |
*** 716,717 ****
|
|
|
e0d4ba5 |
--- 716,719 ----
|
|
|
e0d4ba5 |
{ /* Add new patch number below this line */
|
|
|
e0d4ba5 |
+ /**/
|
|
|
e0d4ba5 |
+ 77,
|
|
|
e0d4ba5 |
/**/
|
|
|
e0d4ba5 |
|
|
|
e0d4ba5 |
--
|
|
|
e0d4ba5 |
An operatingsystem is just a name you give to the rest of bloating
|
|
|
e0d4ba5 |
idiosyncratic machine-based-features you left out of your editor.
|
|
|
e0d4ba5 |
(author unknown)
|
|
|
e0d4ba5 |
|
|
|
e0d4ba5 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
e0d4ba5 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
e0d4ba5 |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
e0d4ba5 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|