From: Emilio C. Lopes Date: Fri, 28 Feb 2014 01:55:12 +0000 (-0500) Subject: * lisp/progmodes/sql.el (sql-interactive-mode): Avoid setting global value X-Git-Tag: emacs-24.3.90~361 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=289996f5e1288df9f69df469b44b7a9093ce3198;p=emacs.git * 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 ca8a2a97975..eeab7470e04 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-02-28 Emilio C. Lopes + + * progmodes/sql.el (sql-interactive-mode): + Avoid setting global comint-input-ring-separator. (Bug#16814) + 2014-02-27 Michael Albinus * net/dbus.el (dbus--init-bus): Declare function. diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el index 3f935bbaf5f..13d4178116e 100644 --- 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))