diff options
| author | Miles Bader <miles@gnu.org> | 2007-01-30 22:18:03 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-01-30 22:18:03 +0000 |
| commit | 41e49ce63ee2f9945ff99a19b00752ea887ef506 (patch) | |
| tree | e6538ca8a746f76f0706c20b666d68d81cedf4dc | |
| parent | 01b8fc600aa254ebffdcc107570f8af3a3e347e4 (diff) | |
| download | emacs-41e49ce63ee2f9945ff99a19b00752ea887ef506.tar.gz emacs-41e49ce63ee2f9945ff99a19b00752ea887ef506.tar.bz2 emacs-41e49ce63ee2f9945ff99a19b00752ea887ef506.zip | |
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 197-199)
- Merge from emacs--devo--0
- Update from CVS
2007-01-28 Andreas Seltenreich <uwi7@rz.uni-karlsruhe.de>
* lisp/gnus/nnslashdot.el (nnslashdot-request-article): Update end-of-article
regexp.
2007-01-24 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/uudecode.el (uudecode-string-to-multibyte): New function emulating
string-to-multibyte.
(uudecode-decode-region-internal): Use it.
2007-01-28 Andreas Seltenreich <uwi7@rz.uni-karlsruhe.de>
* man/gnus.texi (Batching Agents): Fix example. Reported by Tassilo Horn
<tassilo@member.fsf.org>.
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-621
| -rw-r--r-- | lisp/gnus/ChangeLog | 11 | ||||
| -rw-r--r-- | lisp/gnus/nnslashdot.el | 2 | ||||
| -rw-r--r-- | lisp/gnus/uudecode.el | 16 | ||||
| -rw-r--r-- | man/ChangeLog | 5 | ||||
| -rw-r--r-- | man/gnus.texi | 2 |
5 files changed, 33 insertions, 3 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index cc10736aa5d..ddc604c6b5d 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -2,6 +2,17 @@ * gnus-art.el (gnus-button-prefer-mid-or-mail): Fix typo in docstring. +2007-01-28 Andreas Seltenreich <uwi7@rz.uni-karlsruhe.de> + + * nnslashdot.el (nnslashdot-request-article): Update end-of-article + regexp. + +2007-01-24 Katsumi Yamaoka <yamaoka@jpl.org> + + * uudecode.el (uudecode-string-to-multibyte): New function emulating + string-to-multibyte. + (uudecode-decode-region-internal): Use it. + 2007-01-23 Reiner Steib <Reiner.Steib@gmx.de> * gnus-score.el (gnus-home-score-file, gnus-home-adapt-file): Fix diff --git a/lisp/gnus/nnslashdot.el b/lisp/gnus/nnslashdot.el index 28fd34b0da0..35ce9f385e9 100644 --- a/lisp/gnus/nnslashdot.el +++ b/lisp/gnus/nnslashdot.el @@ -259,7 +259,7 @@ (buffer-substring (search-forward "<div class=\"commentBody\">") (progn - (search-forward "<div class=\"commentSub\">") + (search-forward "<div class=\"commentSub\"") (match-beginning 0)))))))) (search-failed (nnslashdot-lose why))) diff --git a/lisp/gnus/uudecode.el b/lisp/gnus/uudecode.el index 41b8c228d1c..d0eb8ae3ec9 100644 --- a/lisp/gnus/uudecode.el +++ b/lisp/gnus/uudecode.el @@ -128,6 +128,20 @@ used is specified by `uudecode-decoder-program'." (message "Can not uudecode"))) (ignore-errors (or file-name (delete-file tempfile)))))) +(eval-and-compile + (defalias 'uudecode-string-to-multibyte + (cond + ((featurep 'xemacs) + 'identity) + ((fboundp 'string-to-multibyte) + 'string-to-multibyte) + (t + (lambda (string) + "Return a multibyte string with the same individual chars as string." + (mapconcat + (lambda (ch) (string-as-multibyte (char-to-string ch))) + string "")))))) + ;;;###autoload (defun uudecode-decode-region-internal (start end &optional file-name) "Uudecode region between START and END without using an external program. @@ -206,7 +220,7 @@ If FILE-NAME is non-nil, save the result to FILE-NAME." (or (markerp end) (setq end (set-marker (make-marker) end))) (goto-char start) (if enable-multibyte-characters - (mapc #'(lambda (x) (insert (string-to-multibyte x))) + (mapc #'(lambda (x) (insert (uudecode-string-to-multibyte x))) (nreverse result)) (insert (apply 'concat (nreverse result)))) (delete-region (point) end)))))) diff --git a/man/ChangeLog b/man/ChangeLog index 87dd059ecd0..b4f9a2ee48c 100644 --- a/man/ChangeLog +++ b/man/ChangeLog @@ -3,6 +3,11 @@ * frames.texi (Secondary Selection): Window clicked does not matter when mouse-yank-at-point is non-nil. +2007-01-28 Andreas Seltenreich <uwi7@rz.uni-karlsruhe.de> + + * gnus.texi (Batching Agents): Fix example. Reported by Tassilo Horn + <tassilo@member.fsf.org>. + 2007-01-27 Eli Zaretskii <eliz@gnu.org> * msdog.texi (ls in Lisp): Document ls-lisp-format-time-list and diff --git a/man/gnus.texi b/man/gnus.texi index 80a9e47c74b..625549890ae 100644 --- a/man/gnus.texi +++ b/man/gnus.texi @@ -19040,7 +19040,7 @@ following incantation: @example #!/bin/sh -emacs -batch -l ~/.emacs -l ~/.gnus.el gnus-agent-batch >/dev/null 2>&1 +emacs -batch -l ~/.emacs -l ~/.gnus.el -f gnus-agent-batch >/dev/null 2>&1 @end example |