From: Michael Albinus <michael.albinus@gmx.de>
Date: Fri, 13 Jul 2012 14:58:12 +0000 (+0200)
Subject: * progmodes/sql.el (sql-comint): Suppress the check for program on
X-Git-Tag: emacs-24.2.90~1199^2~13
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2bb1ae5553a850c02941c15ec31405ac65329173;p=emacs.git

* progmodes/sql.el (sql-comint): Suppress the check for program on
remote hosts.  Reported by Francis Devereux <francis@devrx.org>.
(Bug#11908)
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d0f28f2a63d..6a039a88c59 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2012-07-13  Michael Albinus  <michael.albinus@gmx.de>
+
+	* progmodes/sql.el (sql-comint): Suppress the check for program on
+	remote hosts.  Reported by Francis Devereux <francis@devrx.org>.
+	(Bug#11908)
+
 2012-07-13  Chong Yidong  <cyd@gnu.org>
 
 	* bindings.el: Assign a non-nil permanent-local property to
@@ -375,12 +381,12 @@
 	`git-registered'.
 	(vc-git-mode-line-string): Call `vc-working-revision' instead of
 	`vc-git-working-revision' in order to benefit from the cache.
-	(vc-git-root): Use cache property `git-root'.
+	(vc-git-root): Use cache property `git-root'.  (Bug#11757)
 
 2012-06-30  Dmitry Gutov  <dgutov@yandex.ru>
 
 	* vc/vc-hooks.el (vc-before-save): Clear cache if file has been
-	removed (likely outside Emacs).
+	removed (likely outside Emacs).  (Bug#11757)
 
 2012-06-30  Stefan Monnier  <monnier@iro.umontreal.ca>
 
diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el
index 56f42e31cf1..030cc02f3f4 100644
--- a/lisp/progmodes/sql.el
+++ b/lisp/progmodes/sql.el
@@ -2856,7 +2856,7 @@ appended to the SQLi buffer without disturbing your SQL buffer."
 (defun sql-get-login-ext (symbol prompt history-var plist)
   "Prompt user with extended login parameters.
 
-The global value of SYMBOL is the last value and the global value 
+The global value of SYMBOL is the last value and the global value
 of the SYMBOL is set based on the user's input.
 
 If PLIST is nil, then the user is simply prompted for a string
@@ -2871,7 +2871,7 @@ regexp pattern specified in its value.
 The `:completion' property prompts for a string specified by its
 value.  (The property value is used as the PREDICATE argument to
 `completing-read'.)"
-  (set-default 
+  (set-default
    symbol
    (let* ((default (plist-get plist :default))
           (last-value (default-value symbol))
@@ -4146,10 +4146,12 @@ PRODUCT is the SQL product.  PARAMS is a list of strings which are
 passed as command line arguments."
   (let ((program (sql-get-product-feature product :sqli-program))
         (buf-name "SQL"))
-    ;; make sure we can find the program
-    (unless (executable-find program)
+    ;; Make sure we can find the program.  `executable-find' does not
+    ;; work for remote hosts; we suppress the check there.
+    (unless (or (file-remote-p default-directory)
+		(executable-find program))
       (error "Unable to locate SQL program \'%s\'" program))
-    ;; Make sure buffer name is unique
+    ;; Make sure buffer name is unique.
     (when (sql-buffer-live-p (format "*%s*" buf-name))
       (setq buf-name (format "SQL-%s" product))
       (when (sql-buffer-live-p (format "*%s*" buf-name))