aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Steingold2014-09-09 16:39:31 -0400
committerSam Steingold2014-09-09 16:39:31 -0400
commitc98d0ea46197545b899b463c1ba9ff2fea8e8c6e (patch)
treeca5e68e7483a993eaa3e37273e3afec2619746e4
parent8fe73251b167274c4316e3726b4034dba77a5e88 (diff)
downloademacs-c98d0ea46197545b899b463c1ba9ff2fea8e8c6e.tar.gz
emacs-c98d0ea46197545b899b463c1ba9ff2fea8e8c6e.zip
(sql-default-directory): Fix type annotation.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/progmodes/sql.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ca7e1f7a930..12f0f5e3218 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12014-09-09 Sam Steingold <sds@gnu.org>
2
3 * progmodes/sql.el (sql-default-directory): Fix type annotation.
4
12014-09-09 Stefan Monnier <monnier@iro.umontreal.ca> 52014-09-09 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 * progmodes/cc-awk.el: Remove unneeded cc-bytecomp use. 7 * progmodes/cc-awk.el: Remove unneeded cc-bytecomp use.
diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el
index c4baef82e27..4029b2e8d3b 100644
--- a/lisp/progmodes/sql.el
+++ b/lisp/progmodes/sql.el
@@ -285,7 +285,7 @@ file. Since that is a plaintext file, this could be dangerous."
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 "24.5"
288 :type 'string 288 :type '(choice (const nil) string)
289 :group 'SQL 289 :group 'SQL
290 :safe 'stringp) 290 :safe 'stringp)
291 291