From e274e3f44b07e1cf6186329679ef18ab41eab2f6 Mon Sep 17 00:00:00 2001 From: "Michael R. Mauger" Date: Sun, 29 Mar 2020 20:52:10 -0400 Subject: [PATCH 1/2] 2020-03-29 Michael R. Mauger * lisp/progmodes/sql.el (sql-add-product): Re-correct argument spec. Previous change was due to my mistake; I have resolved back to the prior behavior (Bug#39960). * test/lisp/progmodes/sql-tests.el (sql-test-add-product): Added test to insure I don't make the same mistake again. --- lisp/progmodes/sql.el | 2 +- test/lisp/progmodes/sql-tests.el | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el index 400e304ecf4..a04c26d2764 100644 --- a/lisp/progmodes/sql.el +++ b/lisp/progmodes/sql.el @@ -2740,7 +2740,7 @@ highlighting rules in SQL mode.") nil 'require-match init 'sql-product-history init)))) -(defun sql-add-product (product display &optional plist) +(defun sql-add-product (product display &rest plist) "Add support for a database product in `sql-mode'. Add PRODUCT to `sql-product-alist' which enables `sql-mode' to diff --git a/test/lisp/progmodes/sql-tests.el b/test/lisp/progmodes/sql-tests.el index 65ed76bfb5d..91805ab7251 100644 --- a/test/lisp/progmodes/sql-tests.el +++ b/test/lisp/progmodes/sql-tests.el @@ -187,7 +187,13 @@ Perform ACTION and validate results" (sql-add-product 'xyz "XyzDb") (should (equal (pp-to-string (assoc 'xyz sql-product-alist)) - "(xyz :name \"XyzDb\")\n")))) + "(xyz :name \"XyzDb\")\n"))) + + (sql-test-product-feature-harness + (sql-add-product 'stu "StuDb" :X 1 :Y "2") + + (should (equal (pp-to-string (assoc 'stu sql-product-alist)) + "(stu :name \"StuDb\" :X 1 :Y \"2\")\n")))) (ert-deftest sql-test-add-existing-product () "Add a product that already exists." From 9b47ae23043d952780fc15da6540444ccddd4f58 Mon Sep 17 00:00:00 2001 From: Robert Pluim Date: Fri, 2 Oct 2020 10:47:06 +0200 Subject: [PATCH 2/2] Don't error if no GPG signing key configured * lisp/gnus/mml-sec.el (mml-secure-epg-sign): Partially revert "Make mml-secure-epg-sign bug out if we can't find an identity". It causes signing to fail for people who have not set up mml-secure-{smime,openpgp}-sign-with-sender, which is a regression from Emacs-26 (Bug#40118). In such a situation gpg will use its default key. Do not merge to master. On master Emacs will query the user. --- lisp/gnus/mml-sec.el | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/lisp/gnus/mml-sec.el b/lisp/gnus/mml-sec.el index 740e1d2b722..8d77916e997 100644 --- a/lisp/gnus/mml-sec.el +++ b/lisp/gnus/mml-sec.el @@ -944,16 +944,6 @@ If no one is selected, symmetric encryption will be performed. " (signer-names (mml-secure-signer-names protocol sender)) (signers (mml-secure-signers context signer-names)) signature micalg) - (unless signers - (let ((maybe-msg - (if mml-secure-smime-sign-with-sender - "." - "; try setting `mml-secure-smime-sign-with-sender'."))) - ;; If `mml-secure-smime-sign-with-sender' is already non-nil - ;; then there's no point advising the user to examine it. If - ;; there are any other variables worth examining, please - ;; improve this error message by having it mention them. - (error "Couldn't find any signer names%s" maybe-msg))) (when (eq 'OpenPGP protocol) (setf (epg-context-armor context) t) (setf (epg-context-textmode context) t)