* lisp/progmodes/sql.el (sql-interactive-mode): Avoid setting global value

of comint-input-ring-separator.

Fixes: debbugs:16814

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ca8a2a979756239a4bf368211602e32564281ecb..eeab7470e043ae40b31e48c658da32678512c8a9 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-28  Emilio C. Lopes  <eclig@gmx.net>
+
+       * progmodes/sql.el (sql-interactive-mode):
+       Avoid setting global comint-input-ring-separator.  (Bug#16814)
+
 2014-02-27  Michael Albinus  <michael.albinus@gmx.de>
 
        * net/dbus.el (dbus--init-bus): Declare function.

diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el
index 3f935bbaf5f63d48970a222da3d5ed7b7e45b528..13d4178116e653157578af09a8a13ce981f8a71c 100644 (file)
--- a/lisp/progmodes/sql.el
+++ b/lisp/progmodes/sql.el
@@ -3928,8 +3928,8 @@ you entered, right above the output it created.
   ;; People wanting a different history file for each
   ;; buffer/process/client/whatever can change separator and file-name
   ;; on the sql-interactive-mode-hook.
-  (setq comint-input-ring-separator sql-input-ring-separator
-       comint-input-ring-file-name sql-input-ring-file-name)
+  (setq-local comint-input-ring-separator sql-input-ring-separator)
+  (setq comint-input-ring-file-name sql-input-ring-file-name)
   ;; Calling the hook before calling comint-read-input-ring allows users
   ;; to set comint-input-ring-file-name in sql-interactive-mode-hook.
   (comint-read-input-ring t))