X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=blobdiff_plain;f=lisp%2Fnnimap.el;h=8dad44d3c7e70dd37a7dd2ae9d30fbadf47673b7;hp=f8eb6659ad6e172e1a9a7774c32aa6fb5f9e69a1;hb=47893f5bd2ab35872d43003adc55cafac43b7b7c;hpb=9cbd7bc9b1f11055ebeeeb37fd5d10465f17cdb5

diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index f8eb6659a..8dad44d3c 100644
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -317,8 +317,7 @@ textual parts.")
 		   'starttls))
 		'("imap"))
 	       ((memq nnimap-stream '(ssl tls))
-		(funcall (if (and nil
-				  (fboundp 'open-gnutls-stream))
+		(funcall (if (fboundp 'open-gnutls-stream)
 			     'open-gnutls-stream
 			   'open-tls-stream)
 			 "*nnimap*" (current-buffer) nnimap-address
@@ -338,7 +337,8 @@ textual parts.")
 			    '(open run))))
 	    (nnheader-report 'nnimap "Unable to contact %s:%s via %s"
 			     nnimap-address port nnimap-stream)
-	  (gnus-set-process-query-on-exit-flag (nnimap-process nnimap-object) nil)
+	  (gnus-set-process-query-on-exit-flag
+	   (nnimap-process nnimap-object) nil)
 	  (if (not (setq connection-result (nnimap-wait-for-connection)))
 	      (nnheader-report 'nnimap
 			       "%s" (buffer-substring
@@ -655,7 +655,8 @@ textual parts.")
 (deffoo nnimap-request-rename-group (group new-name &optional server)
   (when (nnimap-possibly-change-group nil server)
     (with-current-buffer (nnimap-buffer)
-      (car (nnimap-command "RENAME %S %S" (utf7-encode group t) (utf7-encode new-name t))))))
+      (car (nnimap-command "RENAME %S %S"
+			   (utf7-encode group t) (utf7-encode new-name t))))))
 
 (deffoo nnimap-request-expunge-group (group &optional server)
   (when (nnimap-possibly-change-group group server)
@@ -1293,13 +1294,15 @@ textual parts.")
 	  (push
 	   (cond
 	    ((eql char ?\[)
-	     (split-string (buffer-substring
-			    (1+ (point))
-			    (1- (search-forward "]" (line-end-position) 'move)))))
+	     (split-string
+	      (buffer-substring
+	       (1+ (point))
+	       (1- (search-forward "]" (line-end-position) 'move)))))
 	    ((eql char ?\()
-	     (split-string (buffer-substring
-			    (1+ (point))
-			    (1- (search-forward ")" (line-end-position) 'move)))))
+	     (split-string
+	      (buffer-substring
+	       (1+ (point))
+	       (1- (search-forward ")" (line-end-position) 'move)))))
 	    ((eql char ?\")
 	     (forward-char 1)
 	     (buffer-substring