andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove calls from string-to-multibyte in nnheader/nntp

Browse source 
* lisp/gnus/nntp.el (nntp-copy-to-buffer): Apparently `insert' now
behaves more like string-make-multibyte, but it now behaves more
like string-to-multibyte, so remove that call here.  I'm not quite
sure I follow that logic, but apparently there are no ill effects.

* lisp/gnus/nnheader.el (nnheader-insert-buffer-substring): Ditto.
This commit is contained in:
Lars Ingebrigtsen 2018-04-15 01:07:38 +02:00
parent 1ad6184c37
commit ef599f6cac
2 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lisp/gnus/nnheader.el
View file

@ -1071,14 +1071,11 @@ See `find-file-noselect' for the arguments."
(defmacro nnheader-insert-buffer-substring (buffer &optional start end)
"Copy string from unibyte buffer to multibyte current buffer."
`(if enable-multibyte-characters
(insert (with-current-buffer ,buffer
(string-to-multibyte
,(if (or start end)
`(buffer-substring (or ,start (point-min))
(or ,end (point-max)))
'(buffer-string)))))
(insert-buffer-substring ,buffer ,start ,end)))
`(insert (with-current-buffer ,buffer
,(if (or start end)
`(buffer-substring (or ,start (point-min))
(or ,end (point-max)))
'(buffer-string)))))
(defvar nnheader-last-message-time '(0 0))
(defun nnheader-message-maybe (&rest args)

4
lisp/gnus/nntp.el
View file

@ -342,9 +342,7 @@ retried once before actually displaying the error report."
`(let ((string (buffer-substring ,start ,end)))
(with-current-buffer ,buffer
(erase-buffer)
(insert (if enable-multibyte-characters
(string-to-multibyte string)
string))
(insert string)
(goto-char (point-min))
nil)))