From c98d0ea46197545b899b463c1ba9ff2fea8e8c6e Mon Sep 17 00:00:00 2001
From: Sam Steingold <sds@gnu.org>
Date: Tue, 9 Sep 2014 16:39:31 -0400
Subject: [PATCH] (sql-default-directory): Fix type annotation.

---
 lisp/ChangeLog        | 4 ++++
 lisp/progmodes/sql.el | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ca7e1f7a930..12f0f5e3218 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2014-09-09  Sam Steingold  <sds@gnu.org>
+
+	* progmodes/sql.el (sql-default-directory): Fix type annotation.
+
 2014-09-09  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* 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."
 (defcustom sql-default-directory nil
   "Default directory for SQL processes."
   :version "24.5"
-  :type 'string
+  :type '(choice (const nil) string)
   :group 'SQL
   :safe 'stringp)
 
-- 
2.39.5