* lisp/gnus/sieve-manage.el (sieve-manage-open-server): Don't quote lambda.

Use plist-get rather than CL's getf.
(sieve-manage-parse-capability): Avoid CL's remove-if.

2 files changed, 15 insertions, 9 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 83831264f58..1b17819fa7e 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,9 @@
+2013-06-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * sieve-manage.el (sieve-manage-open-server): Don't quote lambda.
+        Use plist-get rather than CL's getf.
+        (sieve-manage-parse-capability): Avoid CL's remove-if.
+
 2013-06-13  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * shr.el (shr-expand-url): Expansion should chop off the bits after the
@@ -29,7 +35,7 @@
 
 2013-06-10  Albert Krewinkel  <krewinkel@moltkeplatz.de>
 
-        * sieve-manage.el (sieve-manage-open): work with STARTTLS: shorten
+        * sieve-manage.el (sieve-manage-open): Work with STARTTLS: shorten
         stream managing functions by using open-protocol-stream to do most of
         the work. Has the nice benefit of enabling STARTTLS.
         Wait for capabilities after STARTTLS: following RFC5804, the server
diff --git a/lisp/gnus/sieve-manage.el b/lisp/gnus/sieve-manage.el
index 23ab24152d9..6588f717bcb 100644
--- a/lisp/gnus/sieve-manage.el
+++ b/lisp/gnus/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))