procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "DOn't use string-as-unibyte in Gnus"

Browse source 
This reverts commit d1c9310090.

Not all the cases where we had string-as-unibyte were characters,
so this needs to be considered more thoroughly before being redone.
This commit is contained in:
Lars Ingebrigtsen 2017-02-01 13:48:02 +01:00
parent d805757618
commit 5d61ef0de9
7 changed files with 17 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lisp/gnus/canlock.el
View file

@ -90,7 +90,7 @@ buffer does not look like a news message."
(canlock-sha1
(concat opad
(canlock-sha1
(concat ipad (encode-coding-string message-id 'utf-8))))))))
(concat ipad (string-as-unibyte message-id))))))))
(defun canlock-narrow-to-header ()
"Narrow the buffer to the head of the message."

3
lisp/gnus/gnus-art.el
View file

@ -2938,8 +2938,7 @@ message header will be added to the bodies of the \"text/html\" parts."
(encode-coding-string
title coding))
body content))
(setq eheader (encode-coding-string
(buffer-string) 'utf-8)
(setq eheader (string-as-unibyte (buffer-string))
body content)))
(erase-buffer)
(mm-disable-multibyte)

10
lisp/gnus/gnus-srvr.el
View file

@ -821,13 +821,12 @@ claim them."
(while (not (eobp))
(ignore-errors
(push (cons
(encode-coding-string
(string-as-unibyte
(buffer-substring
(point)
(progn
(skip-chars-forward "^ \t")
(point)))
'utf-8)
(point))))
(let ((last (read cur)))
(cons (read cur) last)))
groups))
@ -835,7 +834,7 @@ claim them."
(while (not (eobp))
(ignore-errors
(push (cons
(encode-coding-string
(string-as-unibyte
(if (eq (char-after) ?\")
(read cur)
(let ((p (point)) (name ""))
@ -847,8 +846,7 @@ claim them."
(skip-chars-forward "^ \t\\\\")
(setq name (concat name (buffer-substring
p (point)))))
name))
'utf-8)
name)))
(let ((last (read cur)))
(cons (read cur) last)))
groups))

4
lisp/gnus/gnus-start.el
View file

@ -1990,7 +1990,7 @@ backend check whether the group actually exists."
(while lists
(setq killed (car lists))
(while killed
(gnus-sethash (encode-coding-string (car killed) 'utf-8) nil hashtb)
(gnus-sethash (string-as-unibyte (car killed)) nil hashtb)
(setq killed (cdr killed)))
(setq lists (cdr lists)))))
@ -2453,7 +2453,7 @@ If FORCE is non-nil, the .newsrc file is read."
(dolist (elem gnus-newsrc-alist)
;; Protect against broken .newsrc.el files.
(when (car elem)
(setcar elem (encode-coding-string (car elem) 'utf-8))))
(setcar elem (string-as-unibyte (car elem)))))
(gnus-make-hashtable-from-newsrc-alist)
(when (file-newer-than-file-p file ding-file)
;; Old format quick file

5
lisp/gnus/mml.el
View file

@ -696,10 +696,9 @@ be \"related\" or \"alternate\"."
(set-buffer-multibyte nil)
(cond
((cdr (assq 'buffer cont))
(insert (encode-coding-string
(insert (string-as-unibyte
(with-current-buffer (cdr (assq 'buffer cont))
(buffer-string))
'utf-8)))
(buffer-string)))))
((and filename
(not (equal (cdr (assq 'nofile cont)) "yes")))
(let ((coding-system-for-read mm-binary-coding-system))

10
lisp/gnus/nnir.el
View file

@ -1818,20 +1818,19 @@ article came from is also searched."
(if (eq (car method) 'nntp)
(while (not (eobp))
(ignore-errors
(push (encode-coding-string
(push (string-as-unibyte
(gnus-group-full-name
(buffer-substring
(point)
(progn
(skip-chars-forward "^ \t")
(point)))
method)
'utf-8)
method))
groups))
(forward-line))
(while (not (eobp))
(ignore-errors
(push (encode-coding-string
(push (string-as-unibyte
(if (eq (char-after) ?\")
(gnus-group-full-name (read cur) method)
(let ((p (point)) (name ""))
@ -1843,8 +1842,7 @@ article came from is also searched."
(skip-chars-forward "^ \t\\\\")
(setq name (concat name (buffer-substring
p (point)))))
(gnus-group-full-name name method)))
'utf-8)
(gnus-group-full-name name method))))
groups))
(forward-line)))))
groups))

7
lisp/gnus/nnmail.el
View file

@ -665,7 +665,7 @@ nn*-request-list should have been called before calling this function."
(setq group (symbol-name group)))
(if (and (numberp (setq max (read buffer)))
(numberp (setq min (read buffer))))
(push (list (encode-coding-string group 'utf-8) (cons min max))
(push (list (string-as-unibyte group) (cons min max))
group-assoc)))
(error nil))
(widen)
@ -1251,9 +1251,8 @@ Return the number of characters in the body."
(insert (if (mm-multibyte-p)
(string-as-multibyte
(format " %s:%d" (caar group-alist) (cdar group-alist)))
(encode-coding-string
(format " %s:%d" (caar group-alist) (cdar group-alist))
'utf-8)))
(string-as-unibyte
(format " %s:%d" (caar group-alist) (cdar group-alist)))))
(setq group-alist (cdr group-alist)))
(insert "\n")))