aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Mauger2013-01-14 21:35:45 -0500
committerMichael Mauger2013-01-14 21:35:45 -0500
commit9d55215c1860cd09d8d5c6d46a89d54c87d52d20 (patch)
tree33431e708524c8ae5fa5f4fbebaf277260e2a78f
parent982c5d68ff9a798d777d25ccfda7ca6616fab1e2 (diff)
downloademacs-9d55215c1860cd09d8d5c6d46a89d54c87d52d20.tar.gz
emacs-9d55215c1860cd09d8d5c6d46a89d54c87d52d20.zip
* progmodes/sql.el (sql-output-to-send): Remove, unused.
(sql-interactive-remove-continuation-prompt): (sql-send-magic-terminator, sql-interactive-mode): Remove references.
-rw-r--r--lisp/ChangeLog7
-rw-r--r--lisp/progmodes/sql.el10
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 @@
12013-01-15 Michael R. Mauger <mmaug@yahoo.com>
2
3 * progmodes/sql.el (sql-output-to-send): Remove, unused.
4 (sql-interactive-remove-continuation-prompt):
5 (sql-send-magic-terminator, sql-interactive-mode): Remove
6 references.
7
12013-01-14 Leo Liu <sdl.web@gmail.com> 82013-01-14 Leo Liu <sdl.web@gmail.com>
2 9
3 * calendar/calendar.el (calendar-redraw): Sync window-point and point. 10 * 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."
3219 3219
3220Allows the suppression of continuation prompts.") 3220Allows the suppression of continuation prompts.")
3221 3221
3222(defvar sql-output-by-send nil
3223 "Non-nil if the command in the input was generated by `sql-send-string'.")
3224
3225(defun sql-input-sender (proc string) 3222(defun sql-input-sender (proc string)
3226 "Send STRING to PROC after applying filters." 3223 "Send STRING to PROC after applying filters."
3227 3224
@@ -3288,8 +3285,7 @@ to avoid deleting non-prompt output."
3288 3285
3289 (if (= sql-output-newline-count 0) 3286 (if (= sql-output-newline-count 0)
3290 (setq sql-output-newline-count nil 3287 (setq sql-output-newline-count nil
3291 oline (concat "\n" oline) 3288 oline (concat "\n" oline))
3292 sql-output-by-send nil)
3293 3289
3294 (setq sql-preoutput-hold oline 3290 (setq sql-preoutput-hold oline
3295 oline "")) 3291 oline ""))
@@ -3383,8 +3379,7 @@ to avoid deleting non-prompt output."
3383 (setq sql-output-newline-count 3379 (setq sql-output-newline-count
3384 (if sql-output-newline-count 3380 (if sql-output-newline-count
3385 (1+ sql-output-newline-count) 3381 (1+ sql-output-newline-count)
3386 1))) 3382 1)))))
3387 (setq sql-output-by-send t)))
3388 3383
3389(defun sql-remove-tabs-filter (str) 3384(defun sql-remove-tabs-filter (str)
3390 "Replace tab characters with spaces." 3385 "Replace tab characters with spaces."
@@ -3857,7 +3852,6 @@ you entered, right above the output it created.
3857 (sql-get-product-feature sql-product :prompt-cont-regexp)) 3852 (sql-get-product-feature sql-product :prompt-cont-regexp))
3858 (make-local-variable 'sql-output-newline-count) 3853 (make-local-variable 'sql-output-newline-count)
3859 (make-local-variable 'sql-preoutput-hold) 3854 (make-local-variable 'sql-preoutput-hold)
3860 (make-local-variable 'sql-output-by-send)
3861 (add-hook 'comint-preoutput-filter-functions 3855 (add-hook 'comint-preoutput-filter-functions
3862 'sql-interactive-remove-continuation-prompt nil t) 3856 'sql-interactive-remove-continuation-prompt nil t)
3863 (make-local-variable 'sql-input-ring-separator) 3857 (make-local-variable 'sql-input-ring-separator)