Merge branch 'main' into dvf_llm_log

aider/io.py

@@ -5,6 +5,7 @@ from datetime import datetime
 from pathlib import Path
 
 from prompt_toolkit.completion import Completer, Completion
+from prompt_toolkit.enums import EditingMode
 from prompt_toolkit.history import FileHistory
 from prompt_toolkit.key_binding import KeyBindings
 from prompt_toolkit.lexers import PygmentsLexer
@@ -107,7 +108,9 @@ class InputOutput:
         encoding="utf-8",
         dry_run=False,
         llm_history_file=None,
+        editingmode=EditingMode.EMACS,
     ):
+        self.editingmode = editingmode
         no_color = os.environ.get("NO_COLOR")
         if no_color is not None and no_color != "":
             pretty = False
@@ -237,7 +240,9 @@ class InputOutput:
             def _(event):
                 event.current_buffer.insert_text("\n")
 
-            session = PromptSession(key_bindings=kb, **session_kwargs)
+            session = PromptSession(
+                key_bindings=kb, editing_mode=self.editingmode, **session_kwargs
+            )
             line = session.prompt()
 
             if line and line[0] == "{" and not multiline_input: