emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] /srv/bzr/emacs/trunk r111525: * progmodes/sql.el (sql-outp


From: Michael Mauger
Subject: [Emacs-diffs] /srv/bzr/emacs/trunk r111525: * progmodes/sql.el (sql-output-to-send): Remove, unused.
Date: Mon, 14 Jan 2013 21:35:45 -0500
User-agent: Bazaar (2.5.0)

------------------------------------------------------------
revno: 111525
committer: Michael Mauger <address@hidden>
branch nick: trunk
timestamp: Mon 2013-01-14 21:35:45 -0500
message:
  * progmodes/sql.el (sql-output-to-send): Remove, unused.
  (sql-interactive-remove-continuation-prompt):
  (sql-send-magic-terminator, sql-interactive-mode): Remove references.
modified:
  lisp/ChangeLog
  lisp/progmodes/sql.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-01-14 15:39:04 +0000
+++ b/lisp/ChangeLog    2013-01-15 02:35:45 +0000
@@ -1,3 +1,10 @@
+2013-01-15  Michael R. Mauger  <address@hidden>
+
+       * 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  <address@hidden>
 
        * calendar/calendar.el (calendar-redraw): Sync window-point and point.

=== modified file 'lisp/progmodes/sql.el'
--- a/lisp/progmodes/sql.el     2013-01-02 16:13:04 +0000
+++ b/lisp/progmodes/sql.el     2013-01-15 02:35:45 +0000
@@ -3219,9 +3219,6 @@
 
 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 @@
 
           (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 @@
       (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 @@
        (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)


reply via email to

[Prev in Thread] Current Thread [Next in Thread]