diff options
| author | Lars Ingebrigtsen | 2016-02-12 16:07:07 +1100 |
|---|---|---|
| committer | Lars Ingebrigtsen | 2016-02-12 16:07:07 +1100 |
| commit | ec9bd245eb4ebc84195f4c466bcb088068ad9de0 (patch) | |
| tree | a30d2618c2650f9b743b8ef90f78eb0f4aa60a98 | |
| parent | ce10b20710dcdf6952a8e6a8de1d054f17bdd883 (diff) | |
| download | emacs-ec9bd245eb4ebc84195f4c466bcb088068ad9de0.tar.gz emacs-ec9bd245eb4ebc84195f4c466bcb088068ad9de0.zip | |
nnweb doesn't need unibyte buffers
* lisp/gnus/nnweb.el (nnweb-retrieve-headers)
(nnweb-read-overview, nnweb-request-article)
(nnweb-google-reference): Unibyte buffers are not needed here.
| -rw-r--r-- | lisp/gnus/nnweb.el | 37 |
1 files changed, 16 insertions, 21 deletions
diff --git a/lisp/gnus/nnweb.el b/lisp/gnus/nnweb.el index 75523965721..7fc4464a06a 100644 --- a/lisp/gnus/nnweb.el +++ b/lisp/gnus/nnweb.el | |||
| @@ -103,10 +103,9 @@ Valid types include `google', `dejanews', and `gmane'.") | |||
| 103 | (with-current-buffer nntp-server-buffer | 103 | (with-current-buffer nntp-server-buffer |
| 104 | (erase-buffer) | 104 | (erase-buffer) |
| 105 | (let (article header) | 105 | (let (article header) |
| 106 | (mm-with-unibyte-current-buffer | 106 | (while (setq article (pop articles)) |
| 107 | (while (setq article (pop articles)) | 107 | (when (setq header (cadr (assq article nnweb-articles))) |
| 108 | (when (setq header (cadr (assq article nnweb-articles))) | 108 | (nnheader-insert-nov header))) |
| 109 | (nnheader-insert-nov header)))) | ||
| 110 | 'nov))) | 109 | 'nov))) |
| 111 | 110 | ||
| 112 | (deffoo nnweb-request-scan (&optional group server) | 111 | (deffoo nnweb-request-scan (&optional group server) |
| @@ -153,8 +152,7 @@ Valid types include `google', `dejanews', and `gmane'.") | |||
| 153 | (let* ((header (cadr (assq article nnweb-articles))) | 152 | (let* ((header (cadr (assq article nnweb-articles))) |
| 154 | (url (and header (mail-header-xref header)))) | 153 | (url (and header (mail-header-xref header)))) |
| 155 | (when (or (and url | 154 | (when (or (and url |
| 156 | (mm-with-unibyte-current-buffer | 155 | (mm-url-insert url)) |
| 157 | (mm-url-insert url))) | ||
| 158 | (and (stringp article) | 156 | (and (stringp article) |
| 159 | (nnweb-definition 'id t) | 157 | (nnweb-definition 'id t) |
| 160 | (let ((fetch (nnweb-definition 'id)) | 158 | (let ((fetch (nnweb-definition 'id)) |
| @@ -164,8 +162,7 @@ Valid types include `google', `dejanews', and `gmane'.") | |||
| 164 | (when (and fetch art) | 162 | (when (and fetch art) |
| 165 | (setq url (format fetch | 163 | (setq url (format fetch |
| 166 | (mm-url-form-encode-xwfu art))) | 164 | (mm-url-form-encode-xwfu art))) |
| 167 | (mm-with-unibyte-current-buffer | 165 | (mm-url-insert url) |
| 168 | (mm-url-insert url)) | ||
| 169 | (if (nnweb-definition 'reference t) | 166 | (if (nnweb-definition 'reference t) |
| 170 | (setq article | 167 | (setq article |
| 171 | (funcall (nnweb-definition | 168 | (funcall (nnweb-definition |
| @@ -215,17 +212,16 @@ Valid types include `google', `dejanews', and `gmane'.") | |||
| 215 | (defun nnweb-read-overview (group) | 212 | (defun nnweb-read-overview (group) |
| 216 | "Read the overview of GROUP and build the map." | 213 | "Read the overview of GROUP and build the map." |
| 217 | (when (file-exists-p (nnweb-overview-file group)) | 214 | (when (file-exists-p (nnweb-overview-file group)) |
| 218 | (mm-with-unibyte-buffer | 215 | (nnheader-insert-file-contents (nnweb-overview-file group)) |
| 219 | (nnheader-insert-file-contents (nnweb-overview-file group)) | 216 | (goto-char (point-min)) |
| 220 | (goto-char (point-min)) | 217 | (let (header) |
| 221 | (let (header) | 218 | (while (not (eobp)) |
| 222 | (while (not (eobp)) | 219 | (setq header (nnheader-parse-nov)) |
| 223 | (setq header (nnheader-parse-nov)) | 220 | (forward-line 1) |
| 224 | (forward-line 1) | 221 | (push (list (mail-header-number header) |
| 225 | (push (list (mail-header-number header) | 222 | header (mail-header-xref header)) |
| 226 | header (mail-header-xref header)) | 223 | nnweb-articles) |
| 227 | nnweb-articles) | 224 | (nnweb-set-hashtb header (car nnweb-articles)))))) |
| 228 | (nnweb-set-hashtb header (car nnweb-articles))))))) | ||
| 229 | 225 | ||
| 230 | (defun nnweb-write-overview (group) | 226 | (defun nnweb-write-overview (group) |
| 231 | "Write the overview file for GROUP." | 227 | "Write the overview file for GROUP." |
| @@ -386,8 +382,7 @@ Valid types include `google', `dejanews', and `gmane'.") | |||
| 386 | (setq nnweb-articles | 382 | (setq nnweb-articles |
| 387 | (nconc nnweb-articles map)) | 383 | (nconc nnweb-articles map)) |
| 388 | (when (setq header (cadar map)) | 384 | (when (setq header (cadar map)) |
| 389 | (mm-with-unibyte-current-buffer | 385 | (mm-url-insert (mail-header-xref header)) |
| 390 | (mm-url-insert (mail-header-xref header))) | ||
| 391 | (caar map)))) | 386 | (caar map)))) |
| 392 | 387 | ||
| 393 | (defun nnweb-google-create-mapping () | 388 | (defun nnweb-google-create-mapping () |