diff options
| author | Lars Ingebrigtsen <larsi@gnus.org> | 2016-02-11 16:13:08 +1100 |
|---|---|---|
| committer | Lars Ingebrigtsen <larsi@gnus.org> | 2016-02-11 16:13:08 +1100 |
| commit | 21cfd14d54370cddc1160d30bc47e17c5ac3a162 (patch) | |
| tree | 1ed08374d1e42dd89d674a2ef840097ea3d4d905 /lisp/gnus/nnmaildir.el | |
| parent | 16b7e605f32862c592ffd1134079b91e3ee4ef91 (diff) | |
| download | emacs-21cfd14d54370cddc1160d30bc47e17c5ac3a162.tar.gz | |
gnus-replace-in-string -> replace-regexp-in-string
* lisp/gnus/gnus-util.el (gnus-replace-in-string): Declare
obsolete. Transform all usages of it into
replace-regexp-in-string.
* lisp/gnus/mailcap.el (mailcap-replace-in-string): Remove.
Diffstat (limited to 'lisp/gnus/nnmaildir.el')
| -rw-r--r-- | lisp/gnus/nnmaildir.el | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/lisp/gnus/nnmaildir.el b/lisp/gnus/nnmaildir.el index 70a3dd99be7..4b154432c7e 100644 --- a/lisp/gnus/nnmaildir.el +++ b/lisp/gnus/nnmaildir.el @@ -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 + (replace-regexp-in-string + (replace-regexp-in-string + (replace-regexp-in-string (system-name) - "\\\\" "\\134" 'literal) - "/" "\\057" 'literal) - ":" "\\072" 'literal)) + "\\\\" "\\134" nil 'literal) + "/" "\\057" nil 'literal) + ":" "\\072" nil 'literal)) (defun nnmaildir-request-type (_group &optional _article) 'mail) @@ -955,8 +955,8 @@ 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 +985,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 +1116,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 +1278,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 |