aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/progmodes/sql.el
diff options
context:
space:
mode:
authorStefan Monnier2014-09-29 14:14:08 -0400
committerStefan Monnier2014-09-29 14:14:08 -0400
commitcbdc06f3be1fb1921454d15d5d9f48bef85cba9e (patch)
treeeadcc7cd3232cc8f8ac5789d5ef48cc69796a19c /lisp/progmodes/sql.el
parent8f24b587c87f621f5bc9997589de5d4e3f73b1c3 (diff)
downloademacs-cbdc06f3be1fb1921454d15d5d9f48bef85cba9e.tar.gz
emacs-cbdc06f3be1fb1921454d15d5d9f48bef85cba9e.zip
Rename 24.5 to 25.1
Except where we expect to backport the corresponding change.
Diffstat (limited to 'lisp/progmodes/sql.el')
-rw-r--r--lisp/progmodes/sql.el8
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el
index 304ff465955..af7cb0dc2f5 100644
--- a/lisp/progmodes/sql.el
+++ b/lisp/progmodes/sql.el
@@ -284,7 +284,7 @@ file. Since that is a plaintext file, this could be dangerous."
284 284
285(defcustom sql-default-directory nil 285(defcustom sql-default-directory nil
286 "Default directory for SQL processes." 286 "Default directory for SQL processes."
287 :version "24.5" 287 :version "25.1"
288 :type '(choice (const nil) string) 288 :type '(choice (const nil) string)
289 :group 'SQL 289 :group 'SQL
290 :safe 'stringp) 290 :safe 'stringp)
@@ -5074,20 +5074,20 @@ buffer.
5074 5074
5075(defcustom sql-vertica-program "vsql" 5075(defcustom sql-vertica-program "vsql"
5076 "Command to start the Vertica client." 5076 "Command to start the Vertica client."
5077 :version "24.5" 5077 :version "25.1"
5078 :type 'file 5078 :type 'file
5079 :group 'SQL) 5079 :group 'SQL)
5080 5080
5081(defcustom sql-vertica-options '("-P" "pager=off") 5081(defcustom sql-vertica-options '("-P" "pager=off")
5082 "List of additional options for `sql-vertica-program'. 5082 "List of additional options for `sql-vertica-program'.
5083The default value disables the internal pager." 5083The default value disables the internal pager."
5084 :version "24.5" 5084 :version "25.1"
5085 :type '(repeat string) 5085 :type '(repeat string)
5086 :group 'SQL) 5086 :group 'SQL)
5087 5087
5088(defcustom sql-vertica-login-params '(user password database server) 5088(defcustom sql-vertica-login-params '(user password database server)
5089 "List of login parameters needed to connect to Vertica." 5089 "List of login parameters needed to connect to Vertica."
5090 :version "24.5" 5090 :version "25.1"
5091 :type 'sql-login-params 5091 :type 'sql-login-params
5092 :group 'SQL) 5092 :group 'SQL)
5093 5093