Ticket #3195: 2_goto_line.patch

src/editor/editcmd.c

@@ -2954 +2954 @@
 {
     char *f;
     static long line = 0;       /* line as typed, saved as default */
+    static unsigned long column = 0;
     long l;
-    char *error;
-    char s[32];
+    char s[65];
+
+    if (column)
+        g_snprintf (s, sizeof (s), "%ld:%lu", line, column);
+    else
+        g_snprintf (s, sizeof (s), "%ld", line);
 
-    g_snprintf (s, sizeof (s), "%ld", line);
     f = input_dialog (_("Goto line"), _("Enter line:"), MC_HISTORY_EDIT_GOTO_LINE, line ? s : "",
                       INPUT_COMPLETE_NONE);
     if (!f)
@@ -2970 +2974 @@
         return;
     }
 
-    l = strtol (f, &error, 0);
-    if (*error)
+    int scanned = sscanf(f, "%ld%*c%lu", &l, &column);
+    if (!(scanned >= 1) || EOF == scanned)
     {
         g_free (f);
         return;
@@ -2982 +2986 @@
         l = edit->buffer.lines + l + 2;
     edit_move_display (edit, l - WIDGET (edit)->lines / 2 - 1);
     edit_move_to_line (edit, l - 1);
+
+    if (scanned == 2)
+    {
+        off_t line_width = edit_buffer_get_current_eol (&edit->buffer) -
+                           edit_buffer_get_current_bol (&edit->buffer);
+        if (column > line_width)
+            column = line_width;
+        edit_cursor_move (edit, column - edit_get_col (edit));
+    }
+    else
+        column = 0;
+
     edit->force |= REDRAW_COMPLETELY;
     g_free (f);
 }