Merge from origin/emacs-25

[gnu-emacs] / lisp / gnus / nnimap.el

diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index c285befc760369dcf68ba51bf079c7149d751470..fc9304f672b6f227e09f85ab7c401e4d08a4be19 100644 (file)
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -26,13 +26,6 @@
 
 ;;; Code:
 
-(eval-and-compile
-  (require 'nnheader)
-  ;; In Emacs 24, `open-protocol-stream' is an autoloaded alias for
-  ;; `make-network-stream'.
-  (unless (fboundp 'open-protocol-stream)
-    (require 'proto-stream)))
-
 (eval-when-compile
   (require 'cl))
 
@@ -234,7 +227,7 @@ textual parts.")
          (delete-region (+ (match-beginning 0) 2) (point))
          (setq string (buffer-substring (point) (+ (point) size)))
          (delete-region (point) (+ (point) size))
-         (insert (format "%S" (mm-subst-char-in-string ?\n ?\s string))))
+         (insert (format "%S" (subst-char-in-string ?\n ?\s string))))
        (beginning-of-line)
        (setq article
              (and (re-search-forward "UID \\([0-9]+\\)" (line-end-position)
@@ -365,7 +358,7 @@ textual parts.")
        (with-current-buffer buffer
          (when (and nnimap-object
                     (nnimap-last-command-time nnimap-object)
-                    (> (gnus-float-time
+                    (> (float-time
                         (time-subtract
                          now
                          (nnimap-last-command-time nnimap-object)))
@@ -424,7 +417,7 @@ textual parts.")
       (when nnimap-server-port
        (push nnimap-server-port ports))
       (let* ((stream-list
-             (open-protocol-stream
+             (open-network-stream
               "*nnimap*" (current-buffer) nnimap-address
               (nnimap-map-port (car ports))
               :type nnimap-stream
@@ -437,7 +430,7 @@ textual parts.")
               :success " OK "
               :starttls-function
               (lambda (capabilities)
-                (when (gnus-string-match-p "STARTTLS" capabilities)
+                (when (string-match-p "STARTTLS" capabilities)
                   "1 STARTTLS\r\n"))))
             (stream (car stream-list))
             (props (cdr stream-list))
@@ -447,9 +440,7 @@ textual parts.")
        (when (and stream (not (memq (process-status stream) '(open run))))
          (setq stream nil))
 
-        (when (and (fboundp 'set-network-process-option) ;; Not in XEmacs.
-                   (fboundp 'process-type) ;; Emacs 22 doesn't provide it.
-                   (eq (process-type stream) 'network))
+        (when (eq (process-type stream) 'network)
           ;; Use TCP-keepalive so that connections that pass through a NAT
           ;; router don't hang when left idle.
           (set-network-process-option stream :keepalive t))
@@ -461,15 +452,15 @@ textual parts.")
              (nnheader-report 'nnimap "Unable to contact %s:%s via %s"
                               nnimap-address (car ports) nnimap-stream)
              'no-connect)
-         (gnus-set-process-query-on-exit-flag stream nil)
-         (if (not (gnus-string-match-p "[*.] \\(OK\\|PREAUTH\\)" greeting))
+         (set-process-query-on-exit-flag stream nil)
+         (if (not (string-match-p "[*.] \\(OK\\|PREAUTH\\)" greeting))
              (nnheader-report 'nnimap "%s" greeting)
            ;; Store the greeting (for debugging purposes).
            (setf (nnimap-greeting nnimap-object) greeting)
            (setf (nnimap-capabilities nnimap-object)
                  (mapcar #'upcase
                          (split-string capabilities)))
-           (unless (gnus-string-match-p "[*.] PREAUTH" greeting)
+           (unless (string-match-p "[*.] PREAUTH" greeting)
              (if (not (setq credentials
                             (if (eq nnimap-authenticator 'anonymous)
                                 (list "anonymous"
@@ -922,7 +913,8 @@ textual parts.")
   t)
 
 (deffoo nnimap-request-move-article (article group server accept-form
-                                            &optional _last internal-move-group)
+                                            &optional _last
+                                            internal-move-group)
   (setq group (nnimap-decode-gnus-group group))
   (when internal-move-group
     (setq internal-move-group (nnimap-decode-gnus-group internal-move-group)))
@@ -932,17 +924,18 @@ textual parts.")
                       'nnimap-request-head
                     'nnimap-request-article)
                   article group server (current-buffer))
-      ;; If the move is internal (on the same server), just do it the easy
-      ;; way.
+      ;; If the move is internal (on the same server), just do it the
+      ;; easy way.
       (let ((message-id (message-field-value "message-id")))
        (if internal-move-group
             (with-current-buffer (nnimap-buffer)
               (let* ((can-move (nnimap-capability "MOVE"))
-                    (command (if can-move
-                                 "UID MOVE %d %S"
-                               "UID COPY %d %S"))
-                    (result (nnimap-command command article
-                                            (utf7-encode internal-move-group t))))
+                    (command (if can-move
+                                 "UID MOVE %d %S"
+                               "UID COPY %d %S"))
+                    (result (nnimap-command
+                             command article
+                             (utf7-encode internal-move-group t))))
                 (when (and (car result) (not can-move))
                   (nnimap-delete-article article))
                 (cons internal-move-group
@@ -951,11 +944,10 @@ textual parts.")
                            internal-move-group server message-id
                            nnimap-request-articles-find-limit)))))
          ;; Move the article to a different method.
-         (let ((result (eval accept-form)))
-           (when result
-             (nnimap-change-group group server)
-             (nnimap-delete-article article)
-             result)))))))
+         (when-let ((result (eval accept-form)))
+           (nnimap-change-group group server)
+           (nnimap-delete-article article)
+           result))))))
 
 (deffoo nnimap-request-expire-articles (articles group &optional server force)
   (setq group (nnimap-decode-gnus-group group))
@@ -1887,9 +1879,7 @@ Return the server's response to the SELECT or EXAMINE command."
   (let ((name "*imap log*"))
     (or (get-buffer name)
         (with-current-buffer (get-buffer-create name)
-          (when (boundp 'window-point-insertion-type)
-            (make-local-variable 'window-point-insertion-type)
-            (setq window-point-insertion-type t))
+         (setq-local window-point-insertion-type t)
           (current-buffer)))))
 
 (defun nnimap-log-command (command)