emacs-diffs
[Top][All Lists]
Advanced

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

[Emacs-diffs] trunk r117844: (sql-set-sqli-buffer): Call `sql-product-in


From: Sam Steingold
Subject: [Emacs-diffs] trunk r117844: (sql-set-sqli-buffer): Call `sql-product-interactive' when no suitable buffer is available.
Date: Mon, 08 Sep 2014 13:57:23 +0000
User-agent: Bazaar (2.6b2)

------------------------------------------------------------
revno: 117844
revision-id: address@hidden
parent: address@hidden
committer: Sam Steingold <address@hidden>
branch nick: trunk
timestamp: Mon 2014-09-08 09:57:19 -0400
message:
  (sql-set-sqli-buffer): Call `sql-product-interactive' when no suitable buffer 
is available.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/progmodes/sql.el          sql.el-20091113204419-o5vbwnq5f7feedwu-1303
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-09-08 12:38:53 +0000
+++ b/lisp/ChangeLog    2014-09-08 13:57:19 +0000
@@ -7,6 +7,8 @@
        (sql-default-directory): New user option.
        (sql-product-interactive): Bind `default-directory' to it to
        enable remote connections using Tramp.
+       (sql-set-sqli-buffer): Call `sql-product-interactive' when no
+       suitable buffer is available.
 
 2014-09-08  Glenn Morris  <address@hidden>
 

=== modified file 'lisp/progmodes/sql.el'
--- a/lisp/progmodes/sql.el     2014-09-08 12:38:53 +0000
+++ b/lisp/progmodes/sql.el     2014-09-08 13:57:19 +0000
@@ -3059,7 +3059,7 @@
   (interactive)
   (let ((default-buffer (sql-find-sqli-buffer)))
     (if (null default-buffer)
-        (user-error "There is no suitable SQLi buffer")
+        (sql-product-interactive)
       (let ((new-buffer (read-buffer "New SQLi buffer: " default-buffer t)))
         (if (null (sql-buffer-live-p new-buffer))
             (user-error "Buffer %s is not a working SQLi buffer" new-buffer)
@@ -3075,10 +3075,9 @@
 I
 See also `sql-help' on how to create such a buffer."
   (interactive)
-  (unless (and sql-buffer (buffer-live-p (get-buffer sql-buffer)))
+  (unless (and sql-buffer (buffer-live-p (get-buffer sql-buffer))
+               (get-buffer-process sql-buffer))
     (sql-set-sqli-buffer))
-  (unless (get-buffer-process sql-buffer)
-    (user-error "Buffer %s has no process" sql-buffer))
   (display-buffer sql-buffer))
 
 (defun sql-make-alternate-buffer-name ()


reply via email to

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