| 1 |
polynomial-c 12/07/30 13:00:36 |
| 2 |
|
| 3 |
Added: mc-4.8.4-Ticket-2853-fileposition-in-mcedit.patch |
| 4 |
mc-4.8.4-Ticket-2858-htmlview-segfault.patch |
| 5 |
Log: |
| 6 |
Fixed bug #427786 and bug #428568 |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 app-misc/mc/files/mc-4.8.4-Ticket-2853-fileposition-in-mcedit.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/mc/files/mc-4.8.4-Ticket-2853-fileposition-in-mcedit.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/mc/files/mc-4.8.4-Ticket-2853-fileposition-in-mcedit.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: mc-4.8.4-Ticket-2853-fileposition-in-mcedit.patch |
| 17 |
=================================================================== |
| 18 |
https://www.midnight-commander.org/ticket/2853 |
| 19 |
https://www.midnight-commander.org/changeset/972beef6ea2392ab30d755e3421b3dd0b4e2a3df |
| 20 |
|
| 21 |
Index: src/args.c |
| 22 |
=================================================================== |
| 23 |
--- src/args.c (revision 23c95d36ac4465627fbc9183e083a8320df77fcf) |
| 24 |
+++ src/args.c (revision 972beef6ea2392ab30d755e3421b3dd0b4e2a3df) |
| 25 |
@@ -546,5 +546,5 @@ |
| 26 |
else |
| 27 |
{ |
| 28 |
- arg = mcedit_arg_vpath_new (tmp_vpath, 1); |
| 29 |
+ arg = mcedit_arg_vpath_new (tmp_vpath, 0); |
| 30 |
vfs_path_free (fname_vpath); |
| 31 |
} |
| 32 |
@@ -553,5 +553,5 @@ |
| 33 |
} |
| 34 |
else |
| 35 |
- arg = mcedit_arg_new (tmp, 1); |
| 36 |
+ arg = mcedit_arg_new (tmp, 0); |
| 37 |
|
| 38 |
flist = g_list_prepend (flist, arg); |
| 39 |
@@ -559,12 +559,9 @@ |
| 40 |
|
| 41 |
if (flist == NULL) |
| 42 |
- flist = g_list_prepend (flist, mcedit_arg_new (NULL, 1)); |
| 43 |
+ flist = g_list_prepend (flist, mcedit_arg_new (NULL, 0)); |
| 44 |
else if (first_line_number != -1) |
| 45 |
{ |
| 46 |
/* overwrite line number for first file */ |
| 47 |
GList *l; |
| 48 |
- |
| 49 |
- if (first_line_number == 0) |
| 50 |
- first_line_number = 1; |
| 51 |
|
| 52 |
l = g_list_last (flist); |
| 53 |
@@ -820,5 +817,5 @@ |
| 54 |
* |
| 55 |
* @param file_name file name |
| 56 |
- * @param line_number line number |
| 57 |
+ * @param line_number line number. If value is 0, try to restore saved position. |
| 58 |
* @return mcedit_arg_t object |
| 59 |
*/ |
| 60 |
@@ -835,5 +832,5 @@ |
| 61 |
* |
| 62 |
* @param file_vpath file path object |
| 63 |
- * @param line_number line number |
| 64 |
+ * @param line_number line number. If value is 0, try to restore saved position. |
| 65 |
* @return mcedit_arg_t object |
| 66 |
*/ |
| 67 |
@@ -846,6 +843,4 @@ |
| 68 |
arg = g_new (mcedit_arg_t, 1); |
| 69 |
arg->file_vpath = file_vpath; |
| 70 |
- if (line_number == 0) |
| 71 |
- line_number = 1; |
| 72 |
arg->line_number = line_number; |
| 73 |
|
| 74 |
|
| 75 |
|
| 76 |
|
| 77 |
1.1 app-misc/mc/files/mc-4.8.4-Ticket-2858-htmlview-segfault.patch |
| 78 |
|
| 79 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/mc/files/mc-4.8.4-Ticket-2858-htmlview-segfault.patch?rev=1.1&view=markup |
| 80 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/mc/files/mc-4.8.4-Ticket-2858-htmlview-segfault.patch?rev=1.1&content-type=text/plain |
| 81 |
|
| 82 |
Index: mc-4.8.4-Ticket-2858-htmlview-segfault.patch |
| 83 |
=================================================================== |
| 84 |
https://www.midnight-commander.org/ticket/2858 |
| 85 |
https://www.midnight-commander.org/changeset/e2f30017a04b5dc557f9d8dd2e281526eba3c97f |
| 86 |
|
| 87 |
Index: src/filemanager/usermenu.c |
| 88 |
=================================================================== |
| 89 |
--- src/filemanager/usermenu.c (revision 409e8ab5fd4c42fd122d42d3d13a455eb6aba96f) |
| 90 |
+++ src/filemanager/usermenu.c (revision e2f30017a04b5dc557f9d8dd2e281526eba3c97f) |
| 91 |
@@ -749,6 +749,7 @@ |
| 92 |
return g_strdup ("%"); |
| 93 |
|
| 94 |
- if (mc_global.mc_run_mode == MC_RUN_FULL) |
| 95 |
- { |
| 96 |
+ switch (mc_global.mc_run_mode) |
| 97 |
+ { |
| 98 |
+ case MC_RUN_FULL: |
| 99 |
if (g_ascii_islower ((gchar) c)) |
| 100 |
panel = current_panel; |
| 101 |
@@ -760,9 +761,16 @@ |
| 102 |
} |
| 103 |
fname = g_strdup (panel->dir.list[panel->selected].fname); |
| 104 |
- } |
| 105 |
+ break; |
| 106 |
+ |
| 107 |
#ifdef USE_INTERNAL_EDIT |
| 108 |
- else if (mc_global.mc_run_mode == MC_RUN_EDITOR) |
| 109 |
+ case MC_RUN_EDITOR: |
| 110 |
fname = edit_get_file_name (edit_widget); |
| 111 |
+ break; |
| 112 |
#endif |
| 113 |
+ |
| 114 |
+ default: |
| 115 |
+ /* other modes don't use formats */ |
| 116 |
+ return g_strdup (""); |
| 117 |
+ } |
| 118 |
|
| 119 |
if (do_quote) |
Archives