[patch] Upstream fix

mc-4.8.4-remember-fileposition-in-mcedit.patch (text/plain), 1.75 KB, created by Lars Wendler (Polynomial-C) (RETIRED) on 2012-07-23 18:50:27 UTC

https://www.midnight-commander.org/ticket/2853
https://www.midnight-commander.org/changeset/972beef6ea2392ab30d755e3421b3dd0b4e2a3df

Index: src/args.c
===================================================================
--- src/args.c	(revision 23c95d36ac4465627fbc9183e083a8320df77fcf)
+++ src/args.c	(revision 972beef6ea2392ab30d755e3421b3dd0b4e2a3df)
@@ -546,5 +546,5 @@
             else
             {
-                arg = mcedit_arg_vpath_new (tmp_vpath, 1);
+                arg = mcedit_arg_vpath_new (tmp_vpath, 0);
                 vfs_path_free (fname_vpath);
             }
@@ -553,5 +553,5 @@
         }
         else
-            arg = mcedit_arg_new (tmp, 1);
+            arg = mcedit_arg_new (tmp, 0);
 
         flist = g_list_prepend (flist, arg);
@@ -559,12 +559,9 @@
 
     if (flist == NULL)
-        flist = g_list_prepend (flist, mcedit_arg_new (NULL, 1));
+        flist = g_list_prepend (flist, mcedit_arg_new (NULL, 0));
     else if (first_line_number != -1)
     {
         /* overwrite line number for first file */
         GList *l;
-
-        if (first_line_number == 0)
-            first_line_number = 1;
 
         l = g_list_last (flist);
@@ -820,5 +817,5 @@
  *
  * @param file_name   file name
- * @param line_number line number
+ * @param line_number line number. If value is 0, try to restore saved position.
  * @return mcedit_arg_t object
  */
@@ -835,5 +832,5 @@
  *
  * @param file_vpath  file path object
- * @param line_number line number
+ * @param line_number line number. If value is 0, try to restore saved position.
  * @return mcedit_arg_t object
  */
@@ -846,6 +843,4 @@
     arg = g_new (mcedit_arg_t, 1);
     arg->file_vpath = file_vpath;
-    if (line_number == 0)
-        line_number = 1;
     arg->line_number = line_number;