Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 17:24:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

* lisp/gnus/mm-util.el: Remove the mm-string-as-multibyte alias.

Browse source
This commit is contained in:
Lars Ingebrigtsen 2016-02-14 18:21:56 +11:00
parent 91823195c5
commit d9bf0c1c6a
4 changed files with 3 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lisp/gnus/mm-decode.el
View file

@ -1806,7 +1806,7 @@ If RECURSIVE, search recursively."
nil t))
(not (eq charset 'ascii)))
(decode-coding-string (buffer-string) charset)
(mm-string-as-multibyte (buffer-string)))
(string-as-multibyte (buffer-string)))
(erase-buffer)
(mm-enable-multibyte)))
(goto-char (point-min))

33
lisp/gnus/mm-util.el
View file

@ -29,39 +29,6 @@
(defvar mm-mime-mule-charset-alist)
;; Emulate functions that are not available in every (X)Emacs version.
;; The name of a function is prefixed with mm-, like `mm-char-int' for
;; `char-int' that is a native XEmacs function, not available in Emacs.
;; Gnus programs all should use mm- functions, not the original ones.
(eval-and-compile
(mapc
(lambda (elem)
(let ((nfunc (intern (format "mm-%s" (car elem)))))
(if (fboundp (car elem))
(defalias nfunc (car elem))
(defalias nfunc (cdr elem)))))
`(
;; string-as-multibyte often doesn't really do what you think it does.
;; Example:
;; (aref (string-as-multibyte "\201") 0) -> 129 (aka ?\201)
;; (aref (string-as-multibyte "\300") 0) -> 192 (aka ?\300)
;; (aref (string-as-multibyte "\300\201") 0) -> 192 (aka ?\300)
;; (aref (string-as-multibyte "\300\201") 1) -> 129 (aka ?\201)
;; but
;; (aref (string-as-multibyte "\201\300") 0) -> 2240
;; (aref (string-as-multibyte "\201\300") 1) -> <error>
;; Better use string-to-multibyte or encode-coding-string.
;; If you really need string-as-multibyte somewhere it's usually
;; because you're using the internal emacs-mule representation (maybe
;; because you're using string-as-unibyte somewhere), which is
;; generally a problem in itself.
;; Here is an approximate equivalence table to help think about it:
;; (string-as-multibyte s) ~= (decode-coding-string s 'emacs-mule)
;; (string-to-multibyte s) ~= (decode-coding-string s 'binary)
;; (string-make-multibyte s) ~= (decode-coding-string s locale-coding-system)
;; `string-as-multibyte' is an Emacs function, not available in XEmacs.
(string-as-multibyte . identity))))
(defun mm-ucs-to-char (codepoint)
"Convert Unicode codepoint to character."
(or (decode-char 'ucs codepoint) ?#))

2
lisp/gnus/mml.el
View file

@ -664,7 +664,7 @@ be \"related\" or \"alternate\"."
(if (setq encoding (cdr (assq 'encoding cont)))
(setq encoding (intern (downcase encoding))))
(setq encoding (mm-encode-buffer type encoding)
coded (mm-string-as-multibyte (buffer-string))))
coded (string-as-multibyte (buffer-string))))
(mml-insert-mime-headers cont type charset encoding nil)
(insert "\n" coded))))
((eq (car cont) 'external)

2
lisp/gnus/nnmail.el
View file

@ -1245,7 +1245,7 @@ Return the number of characters in the body."
(insert (format "Xref: %s" (system-name)))
(while group-alist
(insert (if (mm-multibyte-p)
(mm-string-as-multibyte
(string-as-multibyte
(format " %s:%d" (caar group-alist) (cdar group-alist)))
(string-as-unibyte
(format " %s:%d" (caar group-alist) (cdar group-alist)))))