[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master d76fea2: * lisp/progmodes/sql.el Bug#24483
From: |
Michael Mauger |
Subject: |
[Emacs-diffs] master d76fea2: * lisp/progmodes/sql.el Bug#24483 |
Date: |
Sun, 21 Apr 2019 00:23:56 -0400 (EDT) |
branch: master
commit d76fea29d8cdfcd715c8c1da592adf1b615e12f4
Author: Michael R. Mauger <address@hidden>
Commit: Michael R. Mauger <address@hidden>
* lisp/progmodes/sql.el Bug#24483
(sql-interactive-remove-continuation-prompt): Properly protect
`sql-prompt-cont-regexp'.
(sql-interactive-mode): Same.
---
lisp/progmodes/sql.el | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el
index fa9354e..7d29d00 100644
--- a/lisp/progmodes/sql.el
+++ b/lisp/progmodes/sql.el
@@ -3746,7 +3746,8 @@ to avoid deleting non-prompt output."
(or (> (length (or sql-preoutput-hold "")) 0)
(> (or sql-output-newline-count 0) 0)
(not (or (string-match sql-prompt-regexp oline)
- (string-match sql-prompt-cont-regexp oline)))))
+ (and sql-prompt-cont-regexp
+ (string-match sql-prompt-cont-regexp oline))))))
(save-match-data
(let (prompt-found last-nl)
@@ -4394,12 +4395,12 @@ you entered, right above the output it created.
;; Set comint based on user overrides.
(setq comint-prompt-regexp
(if sql-prompt-cont-regexp
- (concat "\\(" sql-prompt-regexp
- "\\|" sql-prompt-cont-regexp "\\)")
+ (concat "\\(?:\\(?:" sql-prompt-regexp "\\)"
+ "\\|\\(?:" sql-prompt-cont-regexp "\\)\\)")
sql-prompt-regexp))
(setq left-margin (or sql-prompt-length 0))
;; Install input sender
- (set (make-local-variable 'comint-input-sender) 'sql-input-sender)
+ (set (make-local-variable 'comint-input-sender) #'sql-input-sender)
;; People wanting a different history file for each
;; buffer/process/client/whatever can change separator and file-name
;; on the sql-interactive-mode-hook.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master d76fea2: * lisp/progmodes/sql.el Bug#24483,
Michael Mauger <=