andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from gnus--rel--5.10

Browse source 
Patches applied:

 * gnus--rel--5.10  (patch 116-117)

   - Update from CVS

2006-07-18  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>

   [ Backported bug fixes from No Gnus. ]

   * lisp/gnus/nnweb.el (nnweb-google-parse-1): Update regexp for author and date.
   (nnweb-google-search): Respect nnweb-max-hits as upper bound.
   (nnweb-request-article): Do proper xwfu encoding when fetching articles
   by message-id.

   * lisp/gnus/gnus-srvr.el (gnus-browse-unsubscribe-group): Don't subscribe
   unsubscribed groups as if they were killed ones.  It causes duplicate
   entries in gnus-newsrc-alist.

2006-07-17  Reiner Steib  <Reiner.Steib@gmx.de>

   * lisp/gnus/gnus-sum.el (gnus-summary-delete-article): Don't use TAB in doc
   string.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-357
This commit is contained in:
Miles Bader 2006-07-19 01:06:00 +00:00
parent 83676aa2e3
commit 7ce31649a3
4 changed files with 36 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lisp/gnus/ChangeLog
View file

@ -1,3 +1,21 @@
2006-07-18 Andreas Seltenreich <uwi7@rz.uni-karlsruhe.de>
[ Backported bug fixes from No Gnus. ]
* nnweb.el (nnweb-google-parse-1): Update regexp for author and date.
(nnweb-google-search): Respect nnweb-max-hits as upper bound.
(nnweb-request-article): Do proper xwfu encoding when fetching articles
by message-id.
* gnus-srvr.el (gnus-browse-unsubscribe-group): Don't subscribe
unsubscribed groups as if they were killed ones. It causes duplicate
entries in gnus-newsrc-alist.
2006-07-17 Reiner Steib <Reiner.Steib@gmx.de>
* gnus-sum.el (gnus-summary-delete-article): Don't use TAB in doc
string.
2006-07-16 NAKAJI Hiroyuki <nakaji@heimat.jp> (tiny change)
* mm-util.el (mm-charset-synonym-alist): Map windows-31j to cp932.

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

@ -943,19 +943,23 @@ If NUMBER, fetch this number of articles."
(progn
;; Make sure the group has been properly removed before we
;; subscribe to it.
(gnus-kill-ephemeral-group group)
(if (gnus-ephemeral-group-p group)
(gnus-kill-ephemeral-group group))
;; We need to discern between killed/zombie groups and
;; just unsubscribed ones.
(gnus-group-change-level
(list t group gnus-level-default-subscribed
nil nil (if (gnus-server-equal
gnus-browse-current-method "native")
nil
(gnus-method-simplify
gnus-browse-current-method)))
(or (gnus-group-entry group)
(list t group gnus-level-default-subscribed
nil nil (if (gnus-server-equal
gnus-browse-current-method "native")
nil
(gnus-method-simplify
gnus-browse-current-method))))
gnus-level-default-subscribed (gnus-group-level group)
(and (car (nth 1 gnus-newsrc-alist))
(gnus-gethash (car (nth 1 gnus-newsrc-alist))
gnus-newsrc-hashtb))
t)
(null (gnus-group-entry group)))
(delete-char 1)
(insert ? ))
(gnus-group-change-level

2
lisp/gnus/gnus-sum.el
View file

@ -9510,7 +9510,7 @@ deleted forever, right now."
;; Suggested by Jack Vinson <vinson@unagi.cis.upenn.edu>.
(defun gnus-summary-delete-article (&optional n)
"Delete the N next (mail) articles.
This command actually deletes articles. This is not a marking
This command actually deletes articles. This is not a marking
command. The article will disappear forever from your life, never to
return.

8
lisp/gnus/nnweb.el
View file

@ -171,7 +171,8 @@ Valid types include `google', `dejanews', and `gmane'.")
(when (string-match "^<\\(.*\\)>$" article)
(setq art (match-string 1 article)))
(when (and fetch art)
(setq url (format fetch art))
(setq url (format fetch
(mm-url-form-encode-xwfu art)))
(mm-with-unibyte-current-buffer
(mm-url-insert url))
(if (nnweb-definition 'reference t)
@ -365,7 +366,7 @@ Valid types include `google', `dejanews', and `gmane'.")
(mm-url-decode-entities)
(search-backward " - ")
(when (looking-at
" - \\([a-zA-Z]+\\) \\([0-9]+\\)\\(?: \\([0-9]\\{4\\}\\)\\)?, [^\n]+by \\([^<\n]+\\)\n")
" - \\([a-zA-Z]+\\) \\([0-9]+\\)\\(?: \\([0-9]\\{4\\}\\)\\)?[^\n]+by ?\n?\\([^<\n]+\\)\n")
(setq From (match-string 4)
Date (format "%s %s 00:00:00 %s"
(match-string 1)
@ -437,7 +438,8 @@ Valid types include `google', `dejanews', and `gmane'.")
"?"
(mm-url-encode-www-form-urlencoded
`(("q" . ,search)
("num" . "100")
("num" . ,(number-to-string
(min 100 nnweb-max-hits)))
("hq" . "")
("hl" . "en")
("lr" . "")