mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-23 06:00:41 -08:00
Code Issues Projects Releases Wiki Activity

Merge from gnus--rel--5.10

Browse source 
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
This commit is contained in:
Miles Bader 2007-01-30 22:18:03 +00:00
parent 01b8fc600a
commit 41e49ce63e
5 changed files with 33 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lisp/gnus/ChangeLog
View file

@ -2,6 +2,17 @@
* gnus-art.el (gnus-button-prefer-mid-or-mail): Fix typo in docstring. * 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> 2007-01-23 Reiner Steib <Reiner.Steib@gmx.de>
* gnus-score.el (gnus-home-score-file, gnus-home-adapt-file): Fix * gnus-score.el (gnus-home-score-file, gnus-home-adapt-file): Fix

2
lisp/gnus/nnslashdot.el
View file

@ -259,7 +259,7 @@
(buffer-substring (buffer-substring
(search-forward "<div class=\"commentBody\">") (search-forward "<div class=\"commentBody\">")
(progn (progn
(search-forward "<div class=\"commentSub\">") (search-forward "<div class=\"commentSub\"")
(match-beginning 0)))))))) (match-beginning 0))))))))
(search-failed (nnslashdot-lose why))) (search-failed (nnslashdot-lose why)))

16
lisp/gnus/uudecode.el
View file

@ -128,6 +128,20 @@ used is specified by `uudecode-decoder-program'."
(message "Can not uudecode"))) (message "Can not uudecode")))
(ignore-errors (or file-name (delete-file tempfile)))))) (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 ;;;###autoload
(defun uudecode-decode-region-internal (start end &optional file-name) (defun uudecode-decode-region-internal (start end &optional file-name)
"Uudecode region between START and END without using an external program. "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))) (or (markerp end) (setq end (set-marker (make-marker) end)))
(goto-char start) (goto-char start)
(if enable-multibyte-characters (if enable-multibyte-characters
(mapc #'(lambda (x) (insert (string-to-multibyte x))) (mapc #'(lambda (x) (insert (uudecode-string-to-multibyte x)))
(nreverse result)) (nreverse result))
(insert (apply 'concat (nreverse result)))) (insert (apply 'concat (nreverse result))))
(delete-region (point) end)))))) (delete-region (point) end))))))

5
man/ChangeLog
View file

@ -3,6 +3,11 @@
* frames.texi (Secondary Selection): Window clicked does not matter * frames.texi (Secondary Selection): Window clicked does not matter
when mouse-yank-at-point is non-nil. 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> 2007-01-27 Eli Zaretskii <eliz@gnu.org>
* msdog.texi (ls in Lisp): Document ls-lisp-format-time-list and * msdog.texi (ls in Lisp): Document ls-lisp-format-time-list and

2
man/gnus.texi
View file

@ -19040,7 +19040,7 @@ following incantation:
@example @example
#!/bin/sh #!/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 @end example