Contents of /trunk/nano/patches/nano-1.3.8-fix-display.patch
Parent Directory | Revision Log
Revision 153 -
(show annotations)
(download)
Tue May 8 20:52:56 2007 UTC (17 years, 4 months ago) by niro
File size: 2328 byte(s)
Tue May 8 20:52:56 2007 UTC (17 years, 4 months ago) by niro
File size: 2328 byte(s)
-import
1 | http://lists.gnu.org/archive/html/nano-devel/2005-09/msg00012.html |
2 | |
3 | --- nano-1.3.8/src/global.c |
4 | +++ nano-1.3.8/src/global.c |
5 | @@ -528,11 +528,11 @@ |
6 | |
7 | sc_init_one(&main_list, NANO_FORWARD_KEY, N_("Forward"), |
8 | IFHELP(nano_forward_msg, NANO_NO_KEY), NANO_NO_KEY, |
9 | - NANO_NO_KEY, VIEW, do_right_void); |
10 | + NANO_NO_KEY, VIEW, do_right); |
11 | |
12 | sc_init_one(&main_list, NANO_BACK_KEY, N_("Back"), |
13 | IFHELP(nano_back_msg, NANO_NO_KEY), NANO_NO_KEY, |
14 | - NANO_NO_KEY, VIEW, do_left_void); |
15 | + NANO_NO_KEY, VIEW, do_left); |
16 | |
17 | sc_init_one(&main_list, NANO_HOME_KEY, N_("Home"), |
18 | IFHELP(nano_home_msg, NANO_NO_KEY), NANO_NO_KEY, |
19 | --- nano-1.3.8/src/move.c |
20 | +++ nano-1.3.8/src/move.c |
21 | @@ -248,7 +248,7 @@ |
22 | update_line(current, current_x); |
23 | } |
24 | |
25 | -void do_left(bool allow_update) |
26 | +void do_left(void) |
27 | { |
28 | size_t pww_save = placewewant; |
29 | if (current_x > 0) |
30 | @@ -259,16 +259,11 @@ |
31 | } |
32 | placewewant = xplustabs(); |
33 | check_statusblank(); |
34 | - if (allow_update && need_horizontal_update(pww_save)) |
35 | + if (need_horizontal_update(pww_save)) |
36 | update_line(current, current_x); |
37 | } |
38 | |
39 | -void do_left_void(void) |
40 | -{ |
41 | - do_left(TRUE); |
42 | -} |
43 | - |
44 | -void do_right(bool allow_update) |
45 | +void do_right(void) |
46 | { |
47 | size_t pww_save = placewewant; |
48 | assert(current_x <= strlen(current->data)); |
49 | @@ -281,11 +276,6 @@ |
50 | } |
51 | placewewant = xplustabs(); |
52 | check_statusblank(); |
53 | - if (allow_update && need_horizontal_update(pww_save)) |
54 | + if (need_horizontal_update(pww_save)) |
55 | update_line(current, current_x); |
56 | } |
57 | - |
58 | -void do_right_void(void) |
59 | -{ |
60 | - do_right(TRUE); |
61 | -} |
62 | --- nano-1.3.8/src/nano.c |
63 | +++ nano-1.3.8/src/nano.c |
64 | @@ -1304,7 +1304,7 @@ |
65 | void do_backspace(void) |
66 | { |
67 | if (current != fileage || current_x > 0) { |
68 | - do_left(FALSE); |
69 | + do_left(); |
70 | do_delete(); |
71 | } |
72 | } |
73 | @@ -4093,7 +4093,7 @@ |
74 | mark_beginx += char_buf_len; |
75 | #endif |
76 | |
77 | - do_right(FALSE); |
78 | + do_right(); |
79 | |
80 | #ifndef DISABLE_WRAPPING |
81 | /* If we're wrapping text, we need to call edit_refresh(). */ |
82 | --- nano-1.3.8/src/proto.h |
83 | +++ nano-1.3.8/src/proto.h |
84 | @@ -353,10 +353,8 @@ |
85 | void do_page_down(void); |
86 | void do_up(void); |
87 | void do_down(void); |
88 | -void do_left(bool allow_update); |
89 | -void do_left_void(void); |
90 | -void do_right(bool allow_update); |
91 | -void do_right_void(void); |
92 | +void do_left(void); |
93 | +void do_right(void); |
94 | |
95 | /* Public functions in nano.c. */ |
96 | void print_view_warning(void); |