diff options
| -rw-r--r-- | lisp/gnus/nnheader.el | 13 | ||||
| -rw-r--r-- | lisp/gnus/nntp.el | 4 |
2 files changed, 6 insertions, 11 deletions
diff --git a/lisp/gnus/nnheader.el b/lisp/gnus/nnheader.el index 34b4137e935..b9ce20413fb 100644 --- a/lisp/gnus/nnheader.el +++ b/lisp/gnus/nnheader.el | |||
| @@ -1071,14 +1071,11 @@ See `find-file-noselect' for the arguments." | |||
| 1071 | 1071 | ||
| 1072 | (defmacro nnheader-insert-buffer-substring (buffer &optional start end) | 1072 | (defmacro nnheader-insert-buffer-substring (buffer &optional start end) |
| 1073 | "Copy string from unibyte buffer to multibyte current buffer." | 1073 | "Copy string from unibyte buffer to multibyte current buffer." |
| 1074 | `(if enable-multibyte-characters | 1074 | `(insert (with-current-buffer ,buffer |
| 1075 | (insert (with-current-buffer ,buffer | 1075 | ,(if (or start end) |
| 1076 | (string-to-multibyte | 1076 | `(buffer-substring (or ,start (point-min)) |
| 1077 | ,(if (or start end) | 1077 | (or ,end (point-max))) |
| 1078 | `(buffer-substring (or ,start (point-min)) | 1078 | '(buffer-string))))) |
| 1079 | (or ,end (point-max))) | ||
| 1080 | '(buffer-string))))) | ||
| 1081 | (insert-buffer-substring ,buffer ,start ,end))) | ||
| 1082 | 1079 | ||
| 1083 | (defvar nnheader-last-message-time '(0 0)) | 1080 | (defvar nnheader-last-message-time '(0 0)) |
| 1084 | (defun nnheader-message-maybe (&rest args) | 1081 | (defun nnheader-message-maybe (&rest args) |
diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el index 784240f4ff9..be9e4955105 100644 --- a/lisp/gnus/nntp.el +++ b/lisp/gnus/nntp.el | |||
| @@ -342,9 +342,7 @@ retried once before actually displaying the error report." | |||
| 342 | `(let ((string (buffer-substring ,start ,end))) | 342 | `(let ((string (buffer-substring ,start ,end))) |
| 343 | (with-current-buffer ,buffer | 343 | (with-current-buffer ,buffer |
| 344 | (erase-buffer) | 344 | (erase-buffer) |
| 345 | (insert (if enable-multibyte-characters | 345 | (insert string) |
| 346 | (string-to-multibyte string) | ||
| 347 | string)) | ||
| 348 | (goto-char (point-min)) | 346 | (goto-char (point-min)) |
| 349 | nil))) | 347 | nil))) |
| 350 | 348 | ||