diff options
| author | Lars Ingebrigtsen <larsi@gnus.org> | 2016-02-12 14:39:30 +1100 |
|---|---|---|
| committer | Lars Ingebrigtsen <larsi@gnus.org> | 2016-02-12 14:39:30 +1100 |
| commit | 37cf4454b1646481935e7b5bfffc8f64eb484b3a (patch) | |
| tree | abaf9658273165e5f15256db2686d97c81cc47f8 /lisp/gnus/rfc2231.el | |
| parent | 87931c8dc0094facff7c8e27267d630a9254a524 (diff) | |
| download | emacs-37cf4454b1646481935e7b5bfffc8f64eb484b3a.tar.gz emacs-37cf4454b1646481935e7b5bfffc8f64eb484b3a.tar.bz2 emacs-37cf4454b1646481935e7b5bfffc8f64eb484b3a.zip | |
Remove XEmacs compat functions from mm-util.el
* lisp/gnus/mm-util.el (mm-special-display-p): Remove.
(mm-decode-coding-string, mm-encode-coding-string)
(mm-decode-coding-region, mm-encode-coding-region): Remove.
(mm-string-to-multibyte): Remove.
(mm-char-or-char-int-p): Remove.
(mm-ucs-to-char): Remove compat versions of the function.
(mm-read-coding-system): Remove.
(mm-coding-system-p): Remove compat code.
(mm-enrich-utf-8-by-mule-ucs): Remove.
(mm-enable-multibyte, mm-disable-multibyte): Remove compat versions.
(mm-delete-duplicates): Remove.
(mm-multibyte-p): Remove compat versions.
(mm-xemacs-find-mime-charset-1): Remove.
(mm-xemacs-find-mime-charset): Remove.
(mm-make-temp-file): Made obsolete.
(mm-find-buffer-file-coding-system): Remove XEmacs compat.
Diffstat (limited to 'lisp/gnus/rfc2231.el')
| -rw-r--r-- | lisp/gnus/rfc2231.el | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/gnus/rfc2231.el b/lisp/gnus/rfc2231.el index 34c8ecd4583..f5f0c818294 100644 --- a/lisp/gnus/rfc2231.el +++ b/lisp/gnus/rfc2231.el @@ -63,12 +63,13 @@ must never cause a Lisp error." (let (mod) (when (and (string-match "\\\\\"" string) (not (string-match "\\`\"\\|[^\\]\"" string))) - (setq string (mm-replace-in-string string "\\\\\"" "\"") + (setq string (replace-regexp-in-string string "\\\\\"" "\"") mod t)) (when (and (string-match "\\\\(" string) (string-match "\\\\)" string) (not (string-match "\\`(\\|[^\\][()]" string))) - (setq string (mm-replace-in-string string "\\\\\\([()]\\)" "\\1") + (setq string (replace-regexp-in-string string + "\\\\\\([()]\\)" "\\1") mod t)) (or (and mod (ignore-errors @@ -230,7 +231,7 @@ These look like: ;; Decode using the charset, if any. (if (memq coding-system '(nil ascii)) (buffer-string) - (mm-decode-coding-string (buffer-string) coding-system))))) + (decode-coding-string (buffer-string) coding-system))))) (defun rfc2231-encode-string (param value) "Return and PARAM=VALUE string encoded according to RFC2231. |