[Emacs-diffs] /srv/bzr/emacs/trunk r109074: * progmodes/sql.el (sql-comint): Suppress the check for program on

[Michael Albinus]

------------------------------------------------------------
revno: 109074
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Fri 2012-07-13 16:58:12 +0200
message:
  * progmodes/sql.el (sql-comint): Suppress the check for program on
  remote hosts.  Reported by Francis Devereux <address@hidden>.
  (Bug#11908)
modified:
  lisp/ChangeLog
  lisp/progmodes/sql.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-07-13 14:25:59 +0000
+++ b/lisp/ChangeLog    2012-07-13 14:58:12 +0000
@@ -1,3 +1,9 @@
+2012-07-13  Michael Albinus  <address@hidden>
+
+       * progmodes/sql.el (sql-comint): Suppress the check for program on
+       remote hosts.  Reported by Francis Devereux <address@hidden>.
+       (Bug#11908)
+
 2012-07-13  Chong Yidong  <address@hidden>
 
        * 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  <address@hidden>
 
        * 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  <address@hidden>
 

=== modified file 'lisp/progmodes/sql.el'
--- a/lisp/progmodes/sql.el     2012-03-01 05:01:22 +0000
+++ b/lisp/progmodes/sql.el     2012-07-13 14:58:12 +0000
@@ -2856,7 +2856,7 @@
 (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 @@
 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 @@
 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))