* eww.el (eww-tag-select): Don't render totally empty <select> forms.

[gnus] / lisp / sieve-manage.el

diff --git a/lisp/sieve-manage.el b/lisp/sieve-manage.el
index 23ab241..6588f71 100644 (file)
--- a/lisp/sieve-manage.el
+++ b/lisp/sieve-manage.el
@@ -206,15 +206,15 @@ Return the buffer associated with the connection."
          :success "^OK.*\n"
          :return-list t
          :starttls-function
-         '(lambda (capabilities)
-            (when (string-match "\\bSTARTTLS\\b" capabilities)
-              "STARTTLS\r\n")))
+         (lambda (capabilities)
+           (when (string-match "\\bSTARTTLS\\b" capabilities)
+             "STARTTLS\r\n")))
       (setq sieve-manage-process proc)
       (setq sieve-manage-capability
-            (sieve-manage-parse-capability (getf props :capabilities)))
+            (sieve-manage-parse-capability (plist-get props :capabilities)))
       ;; Ignore new capabilities issues after successful STARTTLS
       (when (and (memq stream '(nil network starttls))
-                 (eq (getf props :type) 'tls))
+                 (eq (plist-get props :type) 'tls))
         (sieve-manage-drop-next-answer))
       (current-buffer))))
 
@@ -502,9 +502,9 @@ If NAME is nil, return the full server list of capabilities."
 (defun sieve-manage-parse-capability (str)
   "Parse managesieve capability string `STR'.
 Set variable `sieve-manage-capability' to "
-  (let ((capas (remove-if #'null
-                          (mapcar #'split-string-and-unquote
-                                  (split-string str "\n")))))
+  (let ((capas (delq nil
+                     (mapcar #'split-string-and-unquote
+                             (split-string str "\n")))))
     (when (string= "OK" (caar (last capas)))
       (setq sieve-manage-state 'nonauth))
     capas))