Restore cursor shape behaviour for Emacs mode (dbcli#1610)

* Restore cursor shape behaviour for Emacs mode

* Fix bad merge

* Add header

---------

Co-authored-by: Irina Truong <637013+j-bennet@users.noreply.github.com>

Author: 2 people

changelog.rst

@@ -3,6 +3,9 @@ Unreleased - upstream: 4.5.0
 
 Bug fixes:
 ----------
+* Restore cursor shape behaviour for Emacs mode: ``ModalCursorShapeConfig`` is
+  only applied when vi mode is on, so Emacs mode keeps the terminal's own
+  cursor shape (upstream #1610, cherry-picked).
 * CLI connection flags now also override a ``key=value`` conninfo string
   (``pgcli "host=... user=a" -U b``), completing the 4.5.7 fix that covered
   ``--dsn`` aliases and URIs: this third form still dropped ``-U``/``-h``/``-p``

pgcli/main.py

@@ -1548,7 +1548,7 @@ def get_continuation(width, line_number, is_soft_wrap):
                 enable_suspend=True,
                 editing_mode=EditingMode.VI if self.vi_mode else EditingMode.EMACS,
                 search_ignore_case=True,
-                cursor=ModalCursorShapeConfig(),
+                cursor=ModalCursorShapeConfig() if self.vi_mode else None,
             )
 
             return prompt_app