summaryrefslogtreecommitdiffstats
path: root/source/ap/vim/patches/7.3.077
blob: c0af4b96084b4568bc4191b9bec79dfd2887c9e3 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
To: vim_dev@googlegroups.com
Subject: Patch 7.3.077
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.3.077
Problem:    When updating crypt of swapfile fails there is no error message.
	    (Carlo Teubner)
Solution:   Add the error message.
Files:	    src/memline.c


*** ../vim-7.3.076/src/memline.c	2010-08-15 21:57:31.000000000 +0200
--- src/memline.c	2010-12-08 12:39:10.000000000 +0100
***************
*** 582,587 ****
--- 582,590 ----
  	    idx = ip->ip_index + 1;	    /* go to next index */
  	    page_count = 1;
  	}
+ 
+ 	if (error > 0)
+ 	    EMSG(_("E843: Error while updating swap file crypt"));
      }
  
      mfp->mf_old_key = NULL;
***************
*** 2384,2390 ****
   * Make a copy of the line if necessary.
   */
  /*
!  * get a pointer to a (read-only copy of a) line
   *
   * On failure an error message is given and IObuff is returned (to avoid
   * having to check for error everywhere).
--- 2387,2393 ----
   * Make a copy of the line if necessary.
   */
  /*
!  * Return a pointer to a (read-only copy of a) line.
   *
   * On failure an error message is given and IObuff is returned (to avoid
   * having to check for error everywhere).
***************
*** 2397,2403 ****
  }
  
  /*
!  * ml_get_pos: get pointer to position 'pos'
   */
      char_u *
  ml_get_pos(pos)
--- 2400,2406 ----
  }
  
  /*
!  * Return pointer to position "pos".
   */
      char_u *
  ml_get_pos(pos)
***************
*** 2407,2413 ****
  }
  
  /*
!  * ml_get_curline: get pointer to cursor line.
   */
      char_u *
  ml_get_curline()
--- 2410,2416 ----
  }
  
  /*
!  * Return pointer to cursor line.
   */
      char_u *
  ml_get_curline()
***************
*** 2416,2422 ****
  }
  
  /*
!  * ml_get_cursor: get pointer to cursor position
   */
      char_u *
  ml_get_cursor()
--- 2419,2425 ----
  }
  
  /*
!  * Return pointer to cursor position.
   */
      char_u *
  ml_get_cursor()
***************
*** 2426,2432 ****
  }
  
  /*
!  * get a pointer to a line in a specific buffer
   *
   * "will_change": if TRUE mark the buffer dirty (chars in the line will be
   * changed)
--- 2429,2435 ----
  }
  
  /*
!  * Return a pointer to a line in a specific buffer
   *
   * "will_change": if TRUE mark the buffer dirty (chars in the line will be
   * changed)
*** ../vim-7.3.076/src/version.c	2010-12-08 13:11:15.000000000 +0100
--- src/version.c	2010-12-08 13:15:44.000000000 +0100
***************
*** 716,717 ****
--- 716,719 ----
  {   /* Add new patch number below this line */
+ /**/
+     77,
  /**/

-- 
An operatingsystem is just a name you give to the rest of bloating
idiosyncratic machine-based-features you left out of your editor.
			(author unknown)

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///