commit 3a48ce43d37e6d7e14a51ddfc8ead9c67a1bec41 (HEAD, refs/remotes/origin/master) Author: Eli Zaretskii Date: Sat Sep 28 10:25:08 2019 +0300 Fix running on MS-Windows with non-existing home directory * lisp/startup.el (startup--xdg-or-homedot): Don't access a non-existent user home directory on windows-nt systems. (Bug#37536) diff --git a/lisp/startup.el b/lisp/startup.el index 6e2094d678..863e9aed16 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -510,8 +510,9 @@ DIRS are relative." "/.emacs.d/")))) (if (or (file-exists-p emacs-d-dir) (if (eq system-type 'windows-nt) - (directory-files (concat "~" user-name) nil - "\\`[._]emacs\\(\\.elc?\\)?\\'") + (if (file-directory-p (concat "~" user-name)) + (directory-files (concat "~" user-name) nil + "\\`[._]emacs\\(\\.elc?\\)?\\'")) (file-exists-p (concat "~" init-file-user (if (eq system-type 'ms-dos) "/_emacs" commit 10b81b269fe97afc76e1ab911046f140848719f0 Author: Lars Ingebrigtsen Date: Fri Sep 27 18:21:05 2019 +0200 Mention doc-view-scale-internally in the DocView manual node * doc/emacs/misc.texi (DocView Navigation): Mention doc-view-scale-internally (bug#33226). diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi index 83fb8acf7c..3bfb729dc7 100644 --- a/doc/emacs/misc.texi +++ b/doc/emacs/misc.texi @@ -568,12 +568,15 @@ way (@code{doc-view-scroll-down-or-previous-page}). @findex doc-view-enlarge @findex doc-view-shrink @vindex doc-view-resolution +@vindex doc-view-scale-internally @kindex + @r{(DocView mode)} @kindex - @r{(DocView mode)} You can enlarge or shrink the document with @kbd{+} -(@code{doc-view-enlarge}) and @kbd{-} (@code{doc-view-shrink}). These -commands work by reconverting the document at the new size. To -specify the default size for DocView, customize the variable +(@code{doc-view-enlarge}) and @kbd{-} (@code{doc-view-shrink}). By +default, these commands just rescale the already-rendered image. If +you instead want the image to be re-rendered at the new size, set +@code{doc-view-scale-internally} to @code{nil}. To specify the +default size for DocView, customize the variable @code{doc-view-resolution}. @node DocView Searching commit 283fd5f2f6f3fa1f650c5a77f9e3587faddd6881 Author: Mauro Aranda Date: Fri Sep 27 18:06:36 2019 +0200 Don't discard customizations in progress when adding comments (Bug#5358) * lisp/cus-edit.el (custom-comment-show): Add docstring. Save the widget value in the :shown-value property, before redrawing. (custom-variable-modified-p): New function, to complement the return values of custom-variable-state. (custom-variable-state-set): Use it. (custom-face-value-create): Add children to the custom-face widget before setting the state, to be able to check for user edits. (custom-face-state-set): Check for user edits before calling custom-face-state (bug#5358). * test/lisp/custom-tests.el (custom-test-show-comment-preserves-changes): New test. diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el index 2496963337..b9fd3e0a2d 100644 --- a/lisp/cus-edit.el +++ b/lisp/cus-edit.el @@ -2416,9 +2416,21 @@ If INITIAL-STRING is non-nil, use that rather than \"Parent groups:\"." ;; Those functions are for the menu. WIDGET is NOT the comment widget. It's ;; the global custom one (defun custom-comment-show (widget) - (widget-put widget :comment-shown t) - (custom-redraw widget) - (widget-setup)) + "Show the comment editable field that belongs to WIDGET." + (let ((child (car (widget-get widget :children))) + ;; Just to be safe, we will restore this value after redrawing. + (old-shown-value (widget-get widget :shown-value))) + (widget-put widget :comment-shown t) + ;; Save the changes made by the user before redrawing, to avoid + ;; losing customizations in progress. (Bug#5358) + (if (eq (widget-type widget) 'custom-face) + (if (eq (widget-type child) 'custom-face-edit) + (widget-put widget :shown-value `((t ,(widget-value child)))) + (widget-put widget :shown-value (widget-value child))) + (widget-put widget :shown-value (list (widget-value child)))) + (custom-redraw widget) + (widget-put widget :shown-value old-shown-value) + (widget-setup))) (defun custom-comment-invisible-p (widget) (let ((val (widget-value (widget-get widget :comment-widget)))) @@ -2810,12 +2822,35 @@ Possible return values are `standard', `saved', `set', `themed', 'changed)) (t 'rogue)))) +(defun custom-variable-modified-p (widget) + "Non-nil if the variable value of WIDGET has been modified. +WIDGET should be a custom-variable widget, whose first child is the widget +that holds the value. +Modified means that the widget that holds the value has been edited by the user +in a customize buffer. +To check for other states, call `custom-variable-state'." + (catch 'get-error + (let* ((symbol (widget-get widget :value)) + (get (or (get symbol 'custom-get) 'default-value)) + (value (if (default-boundp symbol) + (condition-case nil + (funcall get symbol) + (error (throw 'get-error t))) + (symbol-value symbol)))) + (not (equal value (widget-value (car (widget-get widget :children)))))))) + (defun custom-variable-state-set (widget &optional state) "Set the state of WIDGET to STATE. -If STATE is nil, the value is computed by `custom-variable-state'." +If STATE is nil, the new state is computed by `custom-variable-modified-p' if +WIDGET has been edited in the Custom buffer, or by `custom-variable-state' +otherwise." (widget-put widget :custom-state - (or state (custom-variable-state (widget-value widget) - (widget-get widget :value))))) + (or state + (and (custom-variable-modified-p widget) 'modified) + (custom-variable-state (widget-value widget) + (widget-value + (car + (widget-get widget :children))))))) (defun custom-variable-standard-value (widget) (get (widget-value widget) 'standard-value)) @@ -3635,9 +3670,9 @@ the present value is saved to its :shown-value property instead." (insert-char ?\s indent)) (widget-create-child-and-convert widget 'sexp :value spec)))) - (custom-face-state-set widget) - (push editor children) - (widget-put widget :children children)))))) + (push editor children) + (widget-put widget :children children) + (custom-face-state-set widget)))))) (defvar custom-face-menu `(("Set for Current Session" custom-face-set) @@ -3723,9 +3758,14 @@ This is one of `set', `saved', `changed', `themed', or `rogue'." state))) (defun custom-face-state-set (widget) - "Set the state of WIDGET." - (widget-put widget :custom-state - (custom-face-state (widget-value widget)))) + "Set the state of WIDGET, a custom-face widget. +If the user edited the widget, set the state to modified. If not, the new +state is one of the return values of `custom-face-state'." + (let ((face (widget-value widget))) + (widget-put widget :custom-state + (if (face-spec-match-p face (custom-face-widget-to-spec widget)) + (custom-face-state face) + 'modified)))) (defun custom-face-action (widget &optional event) "Show the menu for `custom-face' WIDGET. diff --git a/test/lisp/custom-tests.el b/test/lisp/custom-tests.el index 0c49db6c76..270acda292 100644 --- a/test/lisp/custom-tests.el +++ b/test/lisp/custom-tests.el @@ -21,6 +21,10 @@ (require 'ert) +(require 'wid-edit) +(require 'cus-edit) +(require 'seq) ; For `seq-find'. + (ert-deftest custom-theme--load-path () "Test `custom-theme--load-path' behavior." (let ((tmpdir (file-name-as-directory (make-temp-file "custom-tests-" t)))) @@ -123,4 +127,28 @@ (should (equal custom--test-user-option 'baz)) (should (equal custom--test-variable 'baz)))) +;; This tests Bug#5358. +(ert-deftest custom-test-show-comment-preserves-changes () + "Test that adding a comment doesn't discard modifications in progress." + (customize-option 'custom--test-user-option) + (let* ((field (seq-find (lambda (widget) + (eq custom--test-user-option (widget-value widget))) + widget-field-list)) + (parent (widget-get field :parent)) + (origvalue (widget-value field))) + ;; Move to the end of the text of the widget, and modify it. This + ;; modification should be preserved after showing the comment field. + (goto-char (widget-field-text-end field)) + (insert "bar") + (custom-comment-show parent) + ;; From now on, must use `widget-at' to get the value of the widget. + (should-not (eq origvalue (widget-value (widget-at)))) + (should (eq (widget-get parent :custom-state) 'modified)) + (should (eq (widget-value (widget-at)) + (widget-apply field + :value-to-external + (concat + (widget-apply field :value-to-internal origvalue) + "bar")))))) + ;;; custom-tests.el ends here commit 9ba907a5fbafaa323402ec1cfe4239ebf87a8a0a Author: Nikolaus Rath Date: Fri Sep 27 18:03:10 2019 +0200 Run gnus-summary-prepare-exit-hook after flags have been updated * lisp/gnus/gnus-sum.el (gnus-summary-exit): Gnus message flags must be set before expiration, not afterwards (bug#21071). diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el index f83977ac5b..20f338eda1 100644 --- a/lisp/gnus/gnus-sum.el +++ b/lisp/gnus/gnus-sum.el @@ -7290,7 +7290,6 @@ If FORCE (the prefix), also save the .newsrc file(s)." (gnus-score-adaptive)) (when gnus-use-scoring (gnus-score-save))) - (gnus-run-hooks 'gnus-summary-prepare-exit-hook) (when gnus-use-cache (gnus-cache-possibly-remove-articles) (gnus-cache-save-buffers)) @@ -7307,6 +7306,7 @@ If FORCE (the prefix), also save the .newsrc file(s)." (unless quit-config (gnus-run-hooks 'gnus-exit-group-hook) (gnus-summary-update-info)) + (gnus-run-hooks 'gnus-summary-prepare-exit-hook) (gnus-close-group group) ;; Make sure where we were, and go to next newsgroup. (when (gnus-buffer-live-p gnus-group-buffer) commit c86d8d03fbdc545dade5f5ee96d45e0c140f3b82 Author: Lars Ingebrigtsen Date: Fri Sep 27 17:49:37 2019 +0200 Change the lighter in epa-info-mode * lisp/epa.el (epa-info-mode): Change the name of the mode so that it doesn't look like it's Info mode (bug#7287). diff --git a/lisp/epa.el b/lisp/epa.el index 5943348960..a2be9a3dbd 100644 --- a/lisp/epa.el +++ b/lisp/epa.el @@ -285,7 +285,7 @@ You should bind this variable with `let', but do not set it globally.") (epg-sub-key-id (car (epg-key-sub-key-list (widget-get widget :value)))))) -(define-derived-mode epa-key-list-mode special-mode "Keys" +(define-derived-mode epa-key-list-mode special-mode "EPA Keys" "Major mode for `epa-list-keys'." (buffer-disable-undo) (setq truncate-lines t @@ -294,7 +294,7 @@ You should bind this variable with `let', but do not set it globally.") (make-local-variable 'epa-exit-buffer-function) (setq-local revert-buffer-function #'epa--key-list-revert-buffer)) -(define-derived-mode epa-key-mode special-mode "Key" +(define-derived-mode epa-key-mode special-mode "EPA Key" "Major mode for a key description." (buffer-disable-undo) (setq truncate-lines t @@ -302,7 +302,7 @@ You should bind this variable with `let', but do not set it globally.") (setq-local font-lock-defaults '(epa-font-lock-keywords t)) (make-local-variable 'epa-exit-buffer-function)) -(define-derived-mode epa-info-mode special-mode "Info" +(define-derived-mode epa-info-mode special-mode "EPA Info" "Major mode for `epa-info-buffer'." (buffer-disable-undo) (setq truncate-lines t commit 09879c82b268916aefff8b120ed39e25d3ea47cc Author: Lars Ingebrigtsen Date: Fri Sep 27 16:54:59 2019 +0200 gnus-thread-ignore-subject doc string clarification * lisp/gnus/gnus-sum.el (gnus-thread-ignore-subject): Document that when not ignoring subjects, sorting will not happen as expected (bug#35513). diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el index 9d6f456827..f83977ac5b 100644 --- a/lisp/gnus/gnus-sum.el +++ b/lisp/gnus/gnus-sum.el @@ -345,9 +345,15 @@ If threads are hidden, you have to run the command :type 'boolean) (defcustom gnus-thread-ignore-subject t - "If non-nil, which is the default, ignore subjects and do all threading based on the Reference header. + "If non-nil, ignore subjects when creating threads. + If nil, articles that have different subjects from their parents will -start separate threads." +start separate threads. + +Threads that are split because the subject changes will still be +sorted as if they were part of the same thread, and +`gnus-thread-sort-functions' will not apply to these split +threads." :group 'gnus-thread :type 'boolean) commit 102486c16b97eec019ca9eaefa8de213666cea9d Author: Lars Ingebrigtsen Date: Fri Sep 27 16:42:21 2019 +0200 Fix documentation on `C-u a' on nndiary group * doc/misc/gnus.texi (Diary Group Parameters): Remove apparently incorrect documentation about `C-u a' on nndiary groups (bug#36849). diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index 15b108541c..4c69c69292 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -723,7 +723,6 @@ Email Based Diary * The NNDiary Back End:: Basic setup and usage. * The Gnus Diary Library:: Utility toolkit on top of nndiary. -* Sending or Not Sending:: A final note on sending diary messages. The NNDiary Back End @@ -17854,7 +17853,6 @@ explained in the sections below. @menu * The NNDiary Back End:: Basic setup and usage. * The Gnus Diary Library:: Utility toolkit on top of nndiary. -* Sending or Not Sending:: A final note on sending diary messages. @end menu @@ -18167,24 +18165,10 @@ to send a diary message, because if you use @kbd{C-u a} or @kbd{C-u m} on a diary group to prepare a message, these headers will be inserted automatically (although not filled with proper values yet). -@node Sending or Not Sending -@subsection Sending or Not Sending - -Well, assuming you've read all of the above, here are two final notes on -mail sending with @code{nndiary}: - -@itemize @bullet -@item @code{nndiary} is a @emph{real} mail back end. You really send real diary messages for real. This means for instance that you can give appointments to anybody (provided they use Gnus and @code{nndiary}) by sending the diary message to them as well. -@item -However, since @code{nndiary} also has a @code{request-post} method, you -can also use @kbd{C-u a} instead of @kbd{C-u m} on a diary group and the -message won't actually be sent; just stored locally in the group. This -comes in very handy for private appointments. -@end itemize @node Gnus Unplugged @section Gnus Unplugged commit 0087ec959db37dbfea89de03b741fb4bf3418533 Author: Lars Ingebrigtsen Date: Fri Sep 27 16:29:51 2019 +0200 Fix reversed check in mm-possibly-verify-or-decrypt * lisp/gnus/mm-decode.el (mm-possibly-verify-or-decrypt): Fix reverse check thinko that made unverified singed messages not display correctly. diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el index d9c14120c2..3de7a0464b 100644 --- a/lisp/gnus/mm-decode.el +++ b/lisp/gnus/mm-decode.el @@ -1745,7 +1745,7 @@ If RECURSIVE, search recursively." (let ((info (get-text-property 0 'gnus-info (car mm-security-handle)))) (if (or (not info) (equal info "") - (equal subtype "encrypted") + (not (equal subtype "encrypted")) (member "OK" (split-string info "\n"))) parts ;; We had an error during decryption. Report what it is. commit 6c8f4c4bdde0a10c2e0bf20f51e1407c3ee85a98 Author: Wilson Snyder Date: Fri Sep 27 10:24:52 2019 -0400 .va/.vah/.sva/.svah now loads Verilog mode. * lisp/files.el (auto-mode-alist): Support .va /.vah/.sva/.svah file extensions to load verilog-mode for Verilog-AMS. Reported by Shareef Jalloq. diff --git a/lisp/files.el b/lisp/files.el index 8c355b02aa..09180fd555 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -2767,7 +2767,7 @@ ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\|CBR\\|7Z\\)\\'" . archive-mo ;; https://en.wikipedia.org/wiki/.har ("\\.har\\'" . javascript-mode) ("\\.json\\'" . javascript-mode) - ("\\.[ds]?vh?\\'" . verilog-mode) + ("\\.[ds]?va?h?\\'" . verilog-mode) ("\\.by\\'" . bovine-grammar-mode) ("\\.wy\\'" . wisent-grammar-mode) ;; .emacs or .gnus or .viper following a directory delimiter in commit bda62c787f76f97ab8db913613223362656181fd Author: Stefan Monnier Date: Fri Sep 27 08:01:04 2019 -0400 * lisp/net/nsm.el: Use lexical-binding (nsm-check-tls-connection, nsm-query): Don't pass explicitly `obarray` since it's the default anyway. (nsm-query, nsm-query-user, nsm-save-host): Remove redundant advertised-calling-convention. diff --git a/lisp/net/nsm.el b/lisp/net/nsm.el index b8c84d5fde..4ca770fd7e 100644 --- a/lisp/net/nsm.el +++ b/lisp/net/nsm.el @@ -1,4 +1,4 @@ -;;; nsm.el --- Network Security Manager +;;; nsm.el --- Network Security Manager -*- lexical-binding:t -*- ;; Copyright (C) 2014-2019 Free Software Foundation, Inc. @@ -269,7 +269,7 @@ See also: `network-security-protocol-checks' and `nsm-noninteractive'" (let* ((results (cl-loop for check in network-security-protocol-checks - for type = (intern (format ":%s" (car check)) obarray) + for type = (intern (format ":%s" (car check))) ;; Skip the check if the user has already said that this ;; host is OK for this type of "error". for result = (and (not (memq type @@ -278,8 +278,7 @@ See also: `network-security-protocol-checks' and `nsm-noninteractive'" (nsm-level (cadr check))) (funcall (intern (format "nsm-protocol-check--%s" - (car check)) - obarray) + (car check))) host port status settings)) when result collect (cons type result))) @@ -321,7 +320,7 @@ See also: `network-security-protocol-checks' and `nsm-noninteractive'" (declare-function gnutls-peer-status-warning-describe "gnutls.c" (status-symbol)) -(defun nsm-protocol-check--verify-cert (host port status settings) +(defun nsm-protocol-check--verify-cert (_host _port status settings) "Check for warnings from the certificate verification status. This is the most basic security check for a TLS connection. If @@ -332,7 +331,7 @@ This is the most basic security check for a TLS connection. If (not (nsm-warnings-ok-p status settings)) (mapconcat #'gnutls-peer-status-warning-describe warnings "\n")))) -(defun nsm-protocol-check--same-cert (host port status settings) +(defun nsm-protocol-check--same-cert (_host _port status settings) "Check for certificate fingerprint mismatch. If the fingerprints saved do not match the fingerprint of the @@ -344,7 +343,7 @@ man-in-the-middle attack." ;; Key exchange checks -(defun nsm-protocol-check--rsa-kx (host port status &optional settings) +(defun nsm-protocol-check--rsa-kx (_host _port status &optional _settings) "Check for static RSA key exchange. Static RSA key exchange methods do not offer perfect forward @@ -374,7 +373,7 @@ Security (DTLS)\", \"(4.1. General Guidelines)\" "RSA key exchange method (%s) does not offer perfect forward secrecy" kx)))) -(defun nsm-protocol-check--dhe-prime-kx (host port status &optional settings) +(defun nsm-protocol-check--dhe-prime-kx (_host _port status &optional _settings) "Check for the key strength of DH key exchange based on integer factorization. This check is a response to Logjam[1]. Logjam is an attack that @@ -405,7 +404,7 @@ Diffie-Hellman Fails in Practice\", `https://weakdh.org/' "Diffie-Hellman key strength (%s bits) too weak (%s bits)" prime-bits 1024)))) -(defun nsm-protocol-check--dhe-kx (host port status &optional settings) +(defun nsm-protocol-check--dhe-kx (_host _port status &optional _settings) "Check for existence of DH key exchange based on integer factorization. In the years since the discovery of Logjam, it was discovered @@ -429,7 +428,7 @@ Diffie-Hellman Backdoors in TLS.\", "unable to verify Diffie-Hellman key exchange method (%s) parameters" kx)))) -(defun nsm-protocol-check--export-kx (host port status &optional settings) +(defun nsm-protocol-check--export-kx (_host _port status &optional _settings) "Check for RSA-EXPORT key exchange. EXPORT cipher suites are a family of 40-bit and 56-bit effective @@ -454,7 +453,7 @@ of user-visible changes.\" Version 3.4.0, "EXPORT level key exchange (%s) is insecure" kx))))) -(defun nsm-protocol-check--anon-kx (host port status &optional settings) +(defun nsm-protocol-check--anon-kx (_host _port status &optional _settings) "Check for anonymous key exchange. Anonymous key exchange exposes the connection to @@ -473,7 +472,7 @@ authentication\", ;; Cipher checks -(defun nsm-protocol-check--cbc-cipher (host port status &optional settings) +(defun nsm-protocol-check--cbc-cipher (_host _port status &optional _settings) "Check for CBC mode ciphers. CBC mode cipher in TLS versions earlier than 1.3 are problematic @@ -502,7 +501,7 @@ Security (TLS) and Datagram Transport Layer Security (DTLS)\", "CBC mode cipher (%s) can be insecure" cipher))))) -(defun nsm-protocol-check--ecdsa-cbc-cipher (host port status &optional settings) +(defun nsm-protocol-check--ecdsa-cbc-cipher (_host _port status &optional _settings) "Check for CBC mode cipher usage under ECDSA key exchange. CBC mode cipher in TLS versions earlier than 1.3 are problematic @@ -540,7 +539,7 @@ Security (TLS) and Datagram Transport Layer Security (DTLS)\", "CBC mode cipher (%s) can be insecure" cipher))))) -(defun nsm-protocol-check--3des-cipher (host port status &optional settings) +(defun nsm-protocol-check--3des-cipher (_host _port status &optional _settings) "Check for 3DES ciphers. Due to its use of 64-bit block size, it is known that a @@ -561,7 +560,7 @@ Current Use and Deprecation of TDEA\", "3DES cipher (%s) is weak" cipher)))) -(defun nsm-protocol-check--rc4-cipher (host port status &optional settings) +(defun nsm-protocol-check--rc4-cipher (_host _port status &optional _settings) "Check for RC4 ciphers. RC4 cipher has been prohibited by RFC 7465[1]. @@ -585,7 +584,7 @@ Reference: ;; Signature checks -(defun nsm-protocol-check--sha1-sig (host port status &optional settings) +(defun nsm-protocol-check--sha1-sig (_host _port status &optional _settings) "Check for SHA1 signatures on certificates. The first SHA1 collision was found in 2017[1], as a precaution @@ -620,7 +619,7 @@ SHA-1 for SSL/TLS Certificates in Microsoft Edge and Internet Explorer algo) end)) -(defun nsm-protocol-check--md5-sig (host port status &optional settings) +(defun nsm-protocol-check--md5-sig (_host _port status &optional _settings) "Check for MD5 signatures on certificates. In 2008, a group of researchers were able to forge an @@ -653,8 +652,8 @@ the MD5 Message-Digest and the HMAC-MD5 Algorithms\", ;; Extension checks -(defun nsm-protocol-check--renegotiation-info-ext (host port status - &optional settings) +(defun nsm-protocol-check--renegotiation-info-ext (_host _port status + &optional _settings) "Check for renegotiation_info TLS extension status. If this TLS extension is not used, the connection established is @@ -676,7 +675,7 @@ Layer Security (TLS) Renegotiation Indication Extension\", ;; Compression checks -(defun nsm-protocol-check--compression (host port status &optional settings) +(defun nsm-protocol-check--compression (_host _port status &optional _settings) "Check for TLS compression. TLS compression attacks such as CRIME would allow an attacker to @@ -697,7 +696,7 @@ Security (DTLS)\", `https://tools.ietf.org/html/rfc7525'" ;; Protocol version checks -(defun nsm-protocol-check--version (host port status &optional settings) +(defun nsm-protocol-check--version (_host _port status &optional _settings) "Check for SSL/TLS protocol version. This function guards against the usage of SSL3.0, which has been @@ -722,7 +721,7 @@ Early TLS\" ;; Full suite checks -(defun nsm-protocol-check--null-suite (host port status &optional settings) +(defun nsm-protocol-check--null-suite (_host _port status &optional _settings) "Check for NULL cipher suites. This function checks for NULL key exchange, cipher and message @@ -790,8 +789,7 @@ protocol." (let ((response (condition-case nil (intern - (car (split-string (nsm-query-user message status))) - obarray) + (car (split-string (nsm-query-user message status)))) ;; Make sure we manage to close the process if the user hits ;; `C-g'. (quit 'no) @@ -807,9 +805,6 @@ protocol." (nsm-save-host host port status what problems response) t)))) -(set-advertised-calling-convention - 'nsm-query '(host port status what problems message) "27.1") - (declare-function gnutls-format-certificate "gnutls.c" (cert)) (defun nsm-query-user (message status) @@ -923,8 +918,6 @@ protocol." (kill-buffer cert-buffer) (kill-buffer buffer))))) -(set-advertised-calling-convention 'nsm-query-user '(message status) "27.1") - (defun nsm-save-host (host port status what problems permanency) (let* ((id (nsm-id host port)) (saved-fingerprints (plist-get (nsm-host-settings id) :fingerprints)) @@ -964,11 +957,6 @@ protocol." (nsm-remove-temporary-setting id) (push saved nsm-temporary-host-settings)))) -(set-advertised-calling-convention - 'nsm-save-host - '(host port status what problems permanency) - "27.1") - (defun nsm-write-settings () (with-temp-file nsm-settings-file (insert "(\n")