Commit ff5e68bf authored by Miles Bader's avatar Miles Bader
Browse files

Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-254

Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 62-64)

   - Merge from emacs--cvs-trunk--0
   - Update from CVS
   - (mm-string-to-multibyte): Use Gnus trunk definition.

2005-04-13  Miles Bader  <miles@gnu.org>

   * lisp/gnus/mm-util.el (mm-string-to-multibyte): Use Gnus trunk definition.

2005-04-12  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/nnrss.el (nnrss-node-text): Replace CRLFs (which might be
   contained in text because xml.el decodes entities) with LFs.
parent 759e9f0c
2005-04-13 Miles Bader <miles@gnu.org>
* mm-util.el (mm-string-to-multibyte): Use Gnus trunk definition.
2005-04-12 Katsumi Yamaoka <yamaoka@jpl.org>
* nnrss.el (nnrss-node-text): Replace CRLFs (which might be
contained in text because xml.el decodes entities) with LFs.
2005-04-11 Lute Kamstra <lute@gnu.org>
* message.el (message-make-date): Handle byte-compiler warnings
......
......@@ -91,7 +91,12 @@
;; (string-to-multibyte s) ~= (decode-coding-string s 'binary)
;; (string-make-multibyte s) ~= (decode-coding-string s locale-coding-system)
(string-as-multibyte . identity)
(string-to-multibyte . mm-string-as-multibyte)
(string-to-multibyte
. (lambda (string)
"Return a multibyte string with the same individual chars as string."
(mapconcat
(lambda (ch) (mm-string-as-multibyte (char-to-string ch)))
string "")))
(multibyte-string-p . ignore)
;; It is not a MIME function, but some MIME functions use it.
(make-temp-file . (lambda (prefix &optional dir-flag)
......
......@@ -679,8 +679,11 @@ It is useful when `(setq nnrss-use-local t)'."
(text (if (and node (listp node))
(nnrss-node-just-text node)
node))
(cleaned-text (if text (gnus-replace-in-string
text "^[\000-\037\177]+\\|^ +\\| +$" ""))))
(cleaned-text (if text
(gnus-replace-in-string
(gnus-replace-in-string
text "^[\000-\037\177]+\\|^ +\\| +$" "")
"\r\n" "\n"))))
(if (string-equal "" cleaned-text)
nil
cleaned-text)))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment