From 9d55215c1860cd09d8d5c6d46a89d54c87d52d20 Mon Sep 17 00:00:00 2001 From: Michael Mauger Date: Mon, 14 Jan 2013 21:35:45 -0500 Subject: [PATCH] * progmodes/sql.el (sql-output-to-send): Remove, unused. (sql-interactive-remove-continuation-prompt): (sql-send-magic-terminator, sql-interactive-mode): Remove references. --- lisp/ChangeLog | 7 +++++++ lisp/progmodes/sql.el | 10 ++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d4a81bffd9c..aa8ccbdea51 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2013-01-15 Michael R. Mauger + + * progmodes/sql.el (sql-output-to-send): Remove, unused. + (sql-interactive-remove-continuation-prompt): + (sql-send-magic-terminator, sql-interactive-mode): Remove + references. + 2013-01-14 Leo Liu * calendar/calendar.el (calendar-redraw): Sync window-point and point. diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el index 453386cdba5..216b272c26b 100644 --- a/lisp/progmodes/sql.el +++ b/lisp/progmodes/sql.el @@ -3219,9 +3219,6 @@ Every newline in STRING will be preceded with a space and a backslash." Allows the suppression of continuation prompts.") -(defvar sql-output-by-send nil - "Non-nil if the command in the input was generated by `sql-send-string'.") - (defun sql-input-sender (proc string) "Send STRING to PROC after applying filters." @@ -3288,8 +3285,7 @@ to avoid deleting non-prompt output." (if (= sql-output-newline-count 0) (setq sql-output-newline-count nil - oline (concat "\n" oline) - sql-output-by-send nil) + oline (concat "\n" oline)) (setq sql-preoutput-hold oline oline "")) @@ -3383,8 +3379,7 @@ to avoid deleting non-prompt output." (setq sql-output-newline-count (if sql-output-newline-count (1+ sql-output-newline-count) - 1))) - (setq sql-output-by-send t))) + 1))))) (defun sql-remove-tabs-filter (str) "Replace tab characters with spaces." @@ -3857,7 +3852,6 @@ you entered, right above the output it created. (sql-get-product-feature sql-product :prompt-cont-regexp)) (make-local-variable 'sql-output-newline-count) (make-local-variable 'sql-preoutput-hold) - (make-local-variable 'sql-output-by-send) (add-hook 'comint-preoutput-filter-functions 'sql-interactive-remove-continuation-prompt nil t) (make-local-variable 'sql-input-ring-separator) -- 2.39.5