From: Pierre Téchoueyres <pierre.techoueyres@free.fr>
Date: Sat, 1 Dec 2018 00:20:45 +0000 (+0100)
Subject: Check that feature exist in `sql-set-product-feature' (Bug#30494).
X-Git-Tag: emacs-27.0.90~3831
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c48ea7c08c95185ddce266744a1959e0ce6b04e1;p=emacs.git

Check that feature exist in `sql-set-product-feature' (Bug#30494).

* lisp/progmodes/sql.el (sql-set-product-feature): Add test for
feature existence.
---

diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el
index ebde684109d..6ad221295ca 100644
--- a/lisp/progmodes/sql.el
+++ b/lisp/progmodes/sql.el
@@ -2668,13 +2668,17 @@ argument must be a plist keyword accepted by
 
   (let* ((p (assoc product sql-product-alist))
          (v (plist-get (cdr p) feature)))
-    (if p
+    (if (and p v)
         (if (and
              (member feature sql-indirect-features)
              (symbolp v))
             (set v newvalue)
           (setcdr p (plist-put (cdr p) feature newvalue)))
-      (error "`%s' is not a known product; use `sql-add-product' to add it first." product))))
+      (progn
+       (when (null p)
+         (error "`%s' is not a known product; use `sql-add-product' to add it first." product))
+       (when (null v)
+         (error "`%s' is not a known feature for `%s'; use `sql-add-product' to add it first." feature product))))))
 
 (defun sql-get-product-feature (product feature &optional fallback not-indirect)
   "Lookup FEATURE associated with a SQL PRODUCT.