Merge from origin/emacs-25

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

diff --git a/lisp/gnus/nnmaildir.el b/lisp/gnus/nnmaildir.el
index 3d8926b69259685040b88fddd8124ae83be54f62..cebdc95876fec189765e3b6a47f1ee2a1987d87e 100644 (file)
--- a/lisp/gnus/nnmaildir.el
+++ b/lisp/gnus/nnmaildir.el
@@ -97,14 +97,14 @@ See `nnmaildir-flag-mark-mapping'."
 
 (defun nnmaildir--ensure-suffix (filename)
   "Ensure that FILENAME contains the suffix \":2,\"."
-  (if (gnus-string-match-p ":2," filename)
+  (if (string-match-p ":2," filename)
       filename
     (concat filename ":2,")))
 
 (defun nnmaildir--add-flag (flag suffix)
   "Return a copy of SUFFIX where FLAG is set.
 SUFFIX should start with \":2,\"."
-  (unless (gnus-string-match-p "^:2," suffix)
+  (unless (string-match-p "^:2," suffix)
     (error "Invalid suffix `%s'" suffix))
   (let* ((flags (substring suffix 3))
         (flags-as-list (append flags nil))
@@ -117,7 +117,7 @@ SUFFIX should start with \":2,\"."
 (defun nnmaildir--remove-flag (flag suffix)
   "Return a copy of SUFFIX where FLAG is cleared.
 SUFFIX should start with \":2,\"."
-  (unless (gnus-string-match-p "^:2," suffix)
+  (unless (string-match-p "^:2," suffix)
     (error "Invalid suffix `%s'" suffix))
   (let* ((flags (substring suffix 3))
         (flags-as-list (append flags nil))
@@ -537,8 +537,8 @@ by nnmaildir-request-article.")
        (prin1 (vector storage-version num msgid nov) (current-buffer))
        (setq file (concat novfile ":"))
        (nnmaildir--unlink file)
-       (gmm-write-region (point-min) (point-max) file nil 'no-message nil
-                         'excl))
+       (write-region (point-min) (point-max) file nil 'no-message nil
+                     'excl))
       (rename-file file novfile 'replace)
       (setf (nnmaildir--art-msgid article) msgid)
       nov)))
@@ -656,13 +656,13 @@ by nnmaildir-request-article.")
   (if (zerop n) 1 (1- (lsh 1 (1+ (logb n))))))
 
 (defun nnmaildir--system-name ()
-  (gnus-replace-in-string
-   (gnus-replace-in-string
-    (gnus-replace-in-string
-     (system-name)
-     "\\\\" "\\134" 'literal)
-    "/" "\\057" 'literal)
-   ":" "\\072" 'literal))
+  (replace-regexp-in-string
+   ":" "\\072"
+   (replace-regexp-in-string
+    "/" "\\057"
+    (replace-regexp-in-string "\\\\" "\\134" (system-name) nil 'literal)
+    nil 'literal)
+   nil 'literal))
 
 (defun nnmaildir-request-type (_group &optional _article)
   'mail)
@@ -848,11 +848,11 @@ by nnmaildir-request-article.")
              (when (or
                     ;; first look for marks in suffix, if it's valid...
                     (when (and (stringp suffix)
-                               (gnus-string-prefix-p ":2," suffix))
+                               (string-prefix-p ":2," suffix))
                       (or
-                       (not (gnus-string-match-p
+                       (not (string-match-p
                              (string (nnmaildir--mark-to-flag 'read)) suffix))
-                       (gnus-string-match-p
+                       (string-match-p
                         (string (nnmaildir--mark-to-flag 'tick)) suffix)))
                     ;; then look in marks directories
                     (not (file-exists-p (concat cdir prefix)))
@@ -955,8 +955,9 @@ by nnmaildir-request-article.")
                        pgname (nnmaildir--pgname nnmaildir--cur-server pgname)
                        group (symbol-value group)
                        ro (nnmaildir--param pgname 'read-only))
-                 (insert (gnus-replace-in-string
-                          (nnmaildir--grp-name group) " " "\\ " t)
+                 (insert (replace-regexp-in-string
+                          " " "\\ "
+                          (nnmaildir--grp-name group) nil t)
                          " ")
                   (princ (nnmaildir--group-maxnum nnmaildir--cur-server group)
                         nntp-server-buffer)
@@ -985,7 +986,7 @@ by nnmaildir-request-article.")
          (princ (nnmaildir--group-maxnum nnmaildir--cur-server group)
                 nntp-server-buffer)
          (insert " "
-                 (gnus-replace-in-string gname " " "\\ " t)
+                 (replace-regexp-in-string " " "\\ " gname nil t)
                  "\n")))))
   'group)
 
@@ -1116,7 +1117,7 @@ by nnmaildir-request-article.")
        (insert " ")
        (princ (nnmaildir--group-maxnum nnmaildir--cur-server group)
               nntp-server-buffer)
-       (insert " " (gnus-replace-in-string gname " " "\\ " t) "\n")
+       (insert " " (replace-regexp-in-string " " "\\ " gname nil t) "\n")
        t))))
 
 (defun nnmaildir-request-create-group (gname &optional server _args)
@@ -1278,7 +1279,7 @@ by nnmaildir-request-article.")
              (insert "\t" (nnmaildir--nov-get-beg nov) "\t"
                      (nnmaildir--art-msgid article) "\t"
                      (nnmaildir--nov-get-mid nov) "\tXref: nnmaildir "
-                     (gnus-replace-in-string gname " " "\\ " t) ":")
+                     (replace-regexp-in-string " " "\\ " gname nil t) ":")
              (princ num nntp-server-buffer)
              (insert "\t" (nnmaildir--nov-get-end nov) "\n"))))
     (catch 'return
@@ -1396,8 +1397,8 @@ by nnmaildir-request-article.")
              (concat "File exists: " tmpfile))
        (throw 'return nil))
       (with-current-buffer buffer
-       (gmm-write-region (point-min) (point-max) tmpfile nil 'no-message nil
-                         'excl))
+       (write-region (point-min) (point-max) tmpfile nil 'no-message nil
+                     'excl))
       (unix-sync) ;; no fsync :(
       (rename-file tmpfile (concat (nnmaildir--cur dir) file suffix) 'replace)
       t)))
@@ -1490,8 +1491,8 @@ by nnmaildir-request-article.")
                                  (throw 'return nil))))
       (condition-case nil (add-name-to-file nnmaildir--file tmpfile)
        (error
-        (gmm-write-region (point-min) (point-max) tmpfile nil 'no-message nil
-                          'excl)
+        (write-region (point-min) (point-max) tmpfile nil 'no-message nil
+                      'excl)
         (when (fboundp 'unix-sync)
           (unix-sync)))) ;; no fsync :(
       (nnheader-cancel-timer 24h)