aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/progmodes/sql.el11
2 files changed, 11 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bf09296e3eb..cb7d88e545d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12012-02-11 Glenn Morris <rgm@gnu.org> 12012-02-11 Glenn Morris <rgm@gnu.org>
2 2
3 * progmodes/sql.el (sql-ansi-statement-starters)
4 (sql-oracle-statement-starters): Add custom type.
5
3 * progmodes/prolog.el: Remove leading '*' from defcustom docs. 6 * progmodes/prolog.el: Remove leading '*' from defcustom docs.
4 (prolog-system-version): Give it a type. 7 (prolog-system-version): Give it a type.
5 8
diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el
index f8f62d113e6..3c5ee36eb98 100644
--- a/lisp/progmodes/sql.el
+++ b/lisp/progmodes/sql.el
@@ -824,7 +824,9 @@ for the first time."
824 824
825All products share this list; products should define a regexp to 825All products share this list; products should define a regexp to
826identify additional keywords in a variable defined by 826identify additional keywords in a variable defined by
827the :statement feature.") 827the :statement feature."
828 :type 'string
829 :group 'SQL)
828 830
829;; Customization for Oracle 831;; Customization for Oracle
830 832
@@ -851,8 +853,11 @@ You will find the file in your Orant\\bin directory."
851 :version "24.1" 853 :version "24.1"
852 :group 'SQL) 854 :group 'SQL)
853 855
854(defcustom sql-oracle-statement-starters (regexp-opt '("declare" "begin" "with")) 856(defcustom sql-oracle-statement-starters
855 "Additional statement starting keywords in Oracle.") 857 (regexp-opt '("declare" "begin" "with"))
858 "Additional statement starting keywords in Oracle."
859 :type 'string
860 :group 'SQL)
856 861
857(defcustom sql-oracle-scan-on t 862(defcustom sql-oracle-scan-on t
858 "Non-nil if placeholders should be replaced in Oracle SQLi. 863 "Non-nil if placeholders should be replaced in Oracle SQLi.