(with-auth-source-epa-overrides): Fix compilation error with `find-file-hooks' on...

[gnus] / lisp / nnimap.el

diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index 681d483..2cfc889 100644 (file)
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -190,7 +190,7 @@ textual parts.")
   (let (article bytes lines size string)
     (block nil
       (while (not (eobp))
-       (while (not (looking-at "^\\* [0-9]+ FETCH.*UID \\([0-9]+\\)"))
+       (while (not (looking-at "\\* [0-9]+ FETCH.+UID \\([0-9]+\\)"))
          (delete-region (point) (progn (forward-line 1) (point)))
          (when (eobp)
            (return)))
@@ -420,9 +420,9 @@ textual parts.")
                        (nnimap-login (car credentials) (cadr credentials))))
                (if (car login-result)
                    (progn
-                    ;; Save the credentials if a save function exists
-                    ;; (such a function will only be passed if a new
-                    ;; token was created).
+                     ;; Save the credentials if a save function exists
+                     ;; (such a function will only be passed if a new
+                     ;; token was created).
                      (when (functionp (nth 2 credentials))
                        (funcall (nth 2 credentials)))
                      ;; See if CAPABILITY is set as part of login
@@ -545,7 +545,7 @@ textual parts.")
                  (nnimap-get-whole-article article))
            (let ((buffer (current-buffer)))
              (with-current-buffer (or to-buffer nntp-server-buffer)
-               (nntp-insert-buffer-substring buffer)
+               (nnheader-insert-buffer-substring buffer)
                (nnheader-ms-strip-cr)))
            (cons group article)))))))
 
@@ -929,7 +929,7 @@ textual parts.")
                 (car (setq result (nnimap-parse-response))))
        ;; Select the last instance of the message in the group.
        (and (setq article
-                  (car (last (assoc "SEARCH" (cdr result)))))
+                  (car (last (cdr (assoc "SEARCH" (cdr result))))))
             (string-to-number article))))))
 
 (defun nnimap-delete-article (articles)
@@ -1904,7 +1904,7 @@ textual parts.")
   (let (article bytes)
     (block nil
       (while (not (eobp))
-       (while (not (looking-at "^\\* [0-9]+ FETCH.*UID \\([0-9]+\\)"))
+       (while (not (looking-at "\\* [0-9]+ FETCH.+UID \\([0-9]+\\)"))
          (delete-region (point) (progn (forward-line 1) (point)))
          (when (eobp)
            (return)))