Commit 5f5475ac authored by Miles Bader's avatar Miles Bader

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

Merge from gnus--rel--5.10

Patches applied:

 * miles@gnu.org--gnu-2005/gnus--rel--5.10  (patch 36)

   - Update from CVS

2005-03-04  Reiner Steib  <Reiner.Steib@gmx.de>

   * lisp/gnus/message.el: Don't autoload former message-utils variables.
   (message-strip-subject-trailing-was): Changed doc string.

   * lisp/gnus/nnweb.el: Fixes for `gnus-group-make-web-group'.
   (nnweb-type-definition): Don't add "hl=en" in `address'.  Added
   `base'.
   (nnweb-google-search): Add "hl=en" here.
   (nnweb-google-parse-1, nnweb-google-create-mapping): Don't
   hardcode URL.
parent 64eb0083
2005-03-04 Reiner Steib <Reiner.Steib@gmx.de>
* message.el: Don't autoload former message-utils variables.
(message-strip-subject-trailing-was): Changed doc string.
* nnweb.el: Fixes for `gnus-group-make-web-group'.
(nnweb-type-definition): Don't add "hl=en" in `address'. Added
`base'.
(nnweb-google-search): Add "hl=en" here.
(nnweb-google-parse-1, nnweb-google-create-mapping): Don't
hardcode URL.
2005-03-03 Reiner Steib <Reiner.Steib@gmx.de>
* message.el (message-get-reply-headers, message-followup):
......
......@@ -335,11 +335,8 @@ few false positives here."
:link '(custom-manual "(message)Message Headers")
:type 'regexp)
;; Fixme: Why are all these things autoloaded?
;;; marking inserted text
;;;###autoload
(defcustom message-mark-insert-begin
"--8<---------------cut here---------------start------------->8---\n"
"How to mark the beginning of some inserted text."
......@@ -348,7 +345,6 @@ few false positives here."
:link '(custom-manual "(message)Insertion Variables")
:group 'message-various)
;;;###autoload
(defcustom message-mark-insert-end
"--8<---------------cut here---------------end--------------->8---\n"
"How to mark the end of some inserted text."
......@@ -357,9 +353,7 @@ few false positives here."
:link '(custom-manual "(message)Insertion Variables")
:group 'message-various)
;;;###autoload
(defcustom message-archive-header
"X-No-Archive: Yes\n"
(defcustom message-archive-header "X-No-Archive: Yes\n"
"Header to insert when you don't want your article to be archived.
Archives \(such as groups.google.com\) respect this header."
:version "22.1"
......@@ -367,7 +361,6 @@ Archives \(such as groups.google.com\) respect this header."
:link '(custom-manual "(message)Header Commands")
:group 'message-various)
;;;###autoload
(defcustom message-archive-note
"X-No-Archive: Yes - save http://groups.google.com/"
"Note to insert why you wouldn't want this posting archived.
......@@ -385,7 +378,6 @@ If nil, don't insert any text in the body."
"Old target for cross-posts or follow-ups.")
(make-variable-buffer-local 'message-cross-post-old-target)
;;;###autoload
(defcustom message-cross-post-default t
"When non-nil `message-cross-post-followup-to' will perform a crosspost.
If nil, `message-cross-post-followup-to' will only do a followup. Note that
......@@ -395,25 +387,19 @@ you can explicitly override this setting by calling
:type 'boolean
:group 'message-various)
;;;###autoload
(defcustom message-cross-post-note
"Crosspost & Followup-To: "
(defcustom message-cross-post-note "Crosspost & Followup-To: "
"Note to insert before signature to notify of cross-post and follow-up."
:version "22.1"
:type 'string
:group 'message-various)
;;;###autoload
(defcustom message-followup-to-note
"Followup-To: "
(defcustom message-followup-to-note "Followup-To: "
"Note to insert before signature to notify of follow-up only."
:version "22.1"
:type 'string
:group 'message-various)
;;;###autoload
(defcustom message-cross-post-note-function
'message-cross-post-insert-note
(defcustom message-cross-post-note-function 'message-cross-post-insert-note
"Function to use to insert note about Crosspost or Followup-To.
The function will be called with four arguments. The function should not only
insert a note, but also ensure old notes are deleted. See the documentation
......@@ -1766,7 +1752,7 @@ see `message-narrow-to-headers-or-head'."
;;; Start of functions adopted from `message-utils.el'.
(defun message-strip-subject-trailing-was (subject)
"Remove trailing \"(Was: <old subject>)\" from SUBJECT lines.
"Remove trailing \"(was: <old subject>)\" from SUBJECT lines.
Leading \"Re: \" is not stripped by this function. Use the function
`message-strip-subject-re' for this."
(let* ((query message-subject-trailing-was-query)
......
......@@ -58,7 +58,8 @@ Valid types include `google', `dejanews', and `gmane'.")
(reference . identity)
(map . nnweb-google-create-mapping)
(search . nnweb-google-search)
(address . "http://groups.google.de/groups?hl=en")
(address . "http://groups.google.de/groups")
(base . "http://groups.google.de")
(identifier . nnweb-google-identity))
(dejanews ;; alias of google
(article . ignore)
......@@ -67,6 +68,7 @@ Valid types include `google', `dejanews', and `gmane'.")
(map . nnweb-google-create-mapping)
(search . nnweb-google-search)
(address . "http://groups.google.com/groups")
(base . "http://groups.google.com")
(identifier . nnweb-google-identity))
(gmane
(article . nnweb-gmane-wash-article)
......@@ -349,7 +351,7 @@ Valid types include `google', `dejanews', and `gmane'.")
"a href=/groups\\(\\?[^ \">]*selm=\\([^ &\">]+\\)\\)" nil t)
(setq mid (match-string 2)
url (format
"http://groups.google.com/groups?selm=%s&output=gplain" mid))
(nnweb-definition 'id) mid))
(narrow-to-region (search-forward ">" nil t)
(search-forward "</a>" nil t))
(mm-url-remove-markup)
......@@ -420,7 +422,7 @@ Valid types include `google', `dejanews', and `gmane'.")
(>= i nnweb-max-hits))
(setq more nil)
;; Yup, there are more articles
(setq more (concat "http://groups.google.com" (match-string 1)))
(setq more (concat (nnweb-definition 'base) (match-string 1)))
(when more
(erase-buffer)
(mm-url-insert more))))
......@@ -435,9 +437,9 @@ Valid types include `google', `dejanews', and `gmane'.")
"?"
(mm-url-encode-www-form-urlencoded
`(("q" . ,search)
("num". "100")
("num" . "100")
("hq" . "")
("hl" . "")
("hl" . "en")
("lr" . "")
("safe" . "off")
("sites" . "groups")))))
......
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