mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 04:10:54 -08:00
Code Issues Projects Releases Wiki Activity

* sql.el (sql-interactive-mode, sql-stop): Correct fix for

Browse source 
Bug#16814 with let-bind of comint-input-ring variables around read
and save functions.
This commit is contained in:
Michael R. Mauger 2014-11-01 18:14:01 -04:00
parent bf7ded963c
commit fcc5b488b9
2 changed files with 19 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lisp/ChangeLog
View file

@ -1,3 +1,9 @@
2014-11-01 Michael R. Mauger <michael@mauger.com>
* sql.el (sql-interactive-mode, sql-stop): Correct fix for
Bug#16814 with let-bind of comint-input-ring variables around read
and save functions.
2014-11-01 Michael Albinus <michael.albinus@gmx.de>
* net/tramp-cache.el (tramp-get-file-property)

23
lisp/progmodes/sql.el
View file

@ -3959,11 +3959,10 @@ you entered, right above the output it created.
;; People wanting a different history file for each
;; buffer/process/client/whatever can change separator and file-name
;; on the sql-interactive-mode-hook.
(setq-local comint-input-ring-separator sql-input-ring-separator)
(setq comint-input-ring-file-name sql-input-ring-file-name)
;; Calling the hook before calling comint-read-input-ring allows users
;; to set comint-input-ring-file-name in sql-interactive-mode-hook.
(comint-read-input-ring t))
(let
((comint-input-ring-separator sql-input-ring-separator)
(comint-input-ring-file-name sql-input-ring-file-name))
(comint-read-input-ring t)))
(defun sql-stop (process event)
"Called when the SQL process is stopped.
@ -3973,11 +3972,15 @@ Writes the input history to a history file using
This function is a sentinel watching the SQL interpreter process.
Sentinels will always get the two parameters PROCESS and EVENT."
(comint-write-input-ring)
(if (and (eq (current-buffer) sql-buffer)
(not buffer-read-only))
(insert (format "\nProcess %s %s\n" process event))
(message "Process %s %s" process event)))
(with-current-buffer (process-buffer process)
(let
((comint-input-ring-separator sql-input-ring-separator)
(comint-input-ring-file-name sql-input-ring-file-name))
(comint-write-input-ring))
(if (not buffer-read-only)
(insert (format "\nProcess %s %s\n" process event))
(message "Process %s %s" process event))))