[Emacs-diffs] trunk r112968: * lisp/gnus/sieve-manage.el (sieve-manage-open-server): Don't quote lambda.

[Stefan Monnier]

------------------------------------------------------------
revno: 112968
revision-id: address@hidden
parent: address@hidden
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Thu 2013-06-13 13:05:22 -0400
message:
  * 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.
modified:
  lisp/gnus/ChangeLog            changelog-20091113204419-o5vbwnq5f7feedwu-1433
  lisp/gnus/sieve-manage.el      
sievemanage.el-20091113204419-o5vbwnq5f7feedwu-3281

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2013-06-13 14:31:52 +0000
+++ b/lisp/gnus/ChangeLog       2013-06-13 17:05:22 +0000
@@ -1,3 +1,9 @@
+2013-06-13  Stefan Monnier  <address@hidden>
+
+       * 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  <address@hidden>
 
        * shr.el (shr-expand-url): Expansion should chop off the bits after the
@@ -29,7 +35,7 @@
 
 2013-06-10  Albert Krewinkel  <address@hidden>
 
-       * 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

=== modified file 'lisp/gnus/sieve-manage.el'
--- a/lisp/gnus/sieve-manage.el 2013-06-11 07:32:25 +0000
+++ b/lisp/gnus/sieve-manage.el 2013-06-13 17:05:22 +0000
@@ -206,15 +206,15 @@
          :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 @@
 (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))