From: Ingo Lohmar <ingo.lohmar@posteo.net>
To: 48417@debbugs.gnu.org
Subject: bug#48417: [PATCH] lisp/progmodes/sql.el: prepend newline in sqli buffer
Date: Fri, 14 May 2021 13:19:22 +0000 [thread overview]
Message-ID: <87tun5wizp.fsf@kenko.localhost.com> (raw)
(sql-remove-continuation-prompt, sql-send-string): Move newline
insertion.
Previously, the preoutput filter `sql-remove-continuation-prompt'
inserted a leading newline in the interactive SQL buffer if it decided
that is has to remove continuation prompts and that it had found all
it was looking for.
1) This filter function was a doubtful place to do that (arguably, its
name does not suggest any action like this).
2) The behavior worked inconsistently, eg, when sending a single-line
"SELECT" statement, because it only ran when the filter function
needed to remove any prompts (for example, not when sending a
region without newlines).
This can lead to misaligned table headers, which explains why
emacswiki and stackoverflow both present several fixes to this
behavior.
Instead of further complicating the prompt removal logic, only insert
the newline before sending to the inferior process, which all goes
through `sql-send-string'. This is robust, and in the worst case
there will be an additional leading newline (with respect to the
previous behavior).
---
lisp/progmodes/sql.el | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el
index 65a4094d70..83cb77ef78 100644
--- a/lisp/progmodes/sql.el
+++ b/lisp/progmodes/sql.el
@@ -3723,8 +3723,7 @@ sql-interactive-remove-continuation-prompt
;; If we've found all the expected prompts, stop looking
(if (= sql-output-newline-count 0)
- (setq sql-output-newline-count nil
- oline (concat "\n" oline))
+ (setq sql-output-newline-count nil)
;; Still more possible prompts, leave them for the next pass
(setq sql-preoutput-hold oline
@@ -3769,6 +3768,8 @@ sql-send-string
(with-current-buffer sql-buffer
(when sql-debug-send
(message ">>SQL> %S" s))
+ (insert "\n")
+ (comint-set-process-mark)
;; Send the string (trim the trailing whitespace)
(sql-input-sender (get-buffer-process (current-buffer)) s)
--
2.30.2
next reply other threads:[~2021-05-14 13:19 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-14 13:19 Ingo Lohmar [this message]
2021-05-16 14:32 ` bug#48417: [PATCH] lisp/progmodes/sql.el: prepend newline in sqli buffer Lars Ingebrigtsen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87tun5wizp.fsf@kenko.localhost.com \
--to=ingo.lohmar@posteo.net \
--cc=48417@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.