@@ -1196,18 +1196,41 @@ pub(super) fn goto_line_number(
11961196 args: &[Cow<str>],
11971197 event: PromptEvent,
11981198) -> anyhow::Result<()> {
1199− if event != PromptEvent::Validate {
1200− return Ok(());
1199+ match event {
1200+ PromptEvent::Abort => {
1201+ if let Some(line_number) = cx.editor.last_line_number {
1202+ goto_line_impl(cx.editor, NonZeroUsize::new(line_number));
1203+ let (view, doc) = current!(cx.editor);
1204+ view.ensure_cursor_in_view(doc, line_number);
1205+ cx.editor.last_line_number = None;
1206+ }
1207+ return Ok(());
1208+ }
1209+ PromptEvent::Validate => {
1210+ ensure!(!args.is_empty(), "Line number required");
1211+ cx.editor.last_line_number = None;
1212+ }
1213+ PromptEvent::Update => {
1214+ if args.is_empty() {
1215+ if let Some(line_number) = cx.editor.last_line_number {
1216+ // When a user hits backspace and there are no numbers left,
1217+ // we can bring them back to their original line
1218+ goto_line_impl(cx.editor, NonZeroUsize::new(line_number));
1219+ let (view, doc) = current!(cx.editor);
1220+ view.ensure_cursor_in_view(doc, line_number);
1221+ cx.editor.last_line_number = None;
1222+ }
1223+ return Ok(());
1224+ }
1225+ let (view, doc) = current!(cx.editor);
1226+ let text = doc.text().slice(..);
1227+ let line = doc.selection(view.id).primary().cursor_line(text);
1228+ cx.editor.last_line_number.get_or_insert(line + 1);
1229+ }
12011230 }
1202−
1203− ensure!(!args.is_empty(), "Line number required");
1204−
12051231 let line = args[0].parse::<usize>()?;
1206−
12071232 goto_line_impl(cx.editor, NonZeroUsize::new(line));
1208−
12091233 let (view, doc) = current!(cx.editor);
1210−
12111234 view.ensure_cursor_in_view(doc, line);
12121235 Ok(())
12131236}