Commit 996aa8c1 authored by Miles Bader's avatar Miles Bader
Browse files

Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 145-148)

   - Merge from emacs--devo--0
   - Update from CVS

2006-10-04  Reiner Steib  <Reiner.Steib@gmx.de>

   * lisp/gnus/gnus-sum.el (gnus-summary-make-menu-bar): Clarify
   gnus-summary-limit-to-articles.

2006-10-04  Romain Francoise  <romain@orebokech.com>

   * lisp/gnus/gnus-util.el (gnus-alist-to-hashtable, gnus-hashtable-to-alist):
   Moved here (and renamed) from gnus-registry.el.

   * lisp/gnus/gnus-registry.el: Require gnus-util.
   Use `gnus-alist-to-hashtable' and `gnus-hashtable-to-alist'.

2006-10-04  Reiner Steib  <Reiner.Steib@gmx.de>

   * lisp/gnus/pop3.el (pop3-authentication-scheme): Clarify doc.
   (pop3-movemail): Warn about pop3-leave-mail-on-server.

2006-10-04  Dave Love  <fx@gnu.org>

   * lisp/gnus/pop3.el (pop3-authentication-scheme): Add custom version.

2006-10-04  Jesper Harder  <harder@ifa.au.dk>

   * lisp/gnus/pop3.el (pop3-leave-mail-on-server): Don't quote nil in
   doc string.  Improve doc string.

2006-10-03  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/gnus-util.el (gnus-with-local-quit): New macro.

   * lisp/gnus/gnus-demon.el (gnus-demon): Replace with-local-quit with it.

2006-10-06  Reiner Steib  <Reiner.Steib@gmx.de>

   * man/gnus.texi (Image Enhancements): Update for Emacs 22.

   * man/gnus-faq.texi ([1.3]): Update.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-466
parent 562204a9
2006-10-04 Reiner Steib <Reiner.Steib@gmx.de>
* gnus-sum.el (gnus-summary-make-menu-bar): Clarify
gnus-summary-limit-to-articles.
2006-10-04 Romain Francoise <romain@orebokech.com>
* gnus-util.el (gnus-alist-to-hashtable, gnus-hashtable-to-alist):
Moved here (and renamed) from gnus-registry.el.
* gnus-registry.el: Require gnus-util.
Use `gnus-alist-to-hashtable' and `gnus-hashtable-to-alist'.
2006-10-04 Reiner Steib <Reiner.Steib@gmx.de>
* pop3.el (pop3-authentication-scheme): Clarify doc.
(pop3-movemail): Warn about pop3-leave-mail-on-server.
2006-10-04 Dave Love <fx@gnu.org>
* pop3.el (pop3-authentication-scheme): Add custom version.
2006-10-04 Jesper Harder <harder@ifa.au.dk>
* pop3.el (pop3-leave-mail-on-server): Don't quote nil in
doc string. Improve doc string.
2006-10-03 Katsumi Yamaoka <yamaoka@jpl.org>
* gnus-util.el (gnus-with-local-quit): New macro.
* gnus-demon.el (gnus-demon): Replace with-local-quit with it.
2006-09-28 Reiner Steib <Reiner.Steib@gmx.de>
* gmm-utils.el (gmm): Adjust custom version.
......@@ -1273,7 +1306,7 @@
as a buffer-local variable. This avoids creating truncated
dribble files as a result of a hang up, eg.
2005-11-04 Ken Manheimer <ken.manheimer@gmail.com>
2005-11-04 Ken Manheimer <ken.manheimer@gmail.com>
* pgg-pgp.el (pgg-pgp-encrypt-region, pgg-pgp-decrypt-region)
(pgg-pgp-encrypt-symmetric-region, pgg-pgp-encrypt-symmetric)
......@@ -4017,7 +4050,7 @@
* gnus-sum.el (gnus-summary-insert-subject): Remove list identifiers.
2004-09-03 Hiroshi Fujishima <pooh@nature.tsukuba.ac.jp> (tiny change)
2004-09-03 Hiroshi Fujishima <pooh@nature.tsukuba.ac.jp> (tiny change)
* spam-stat.el (spam-stat-reduce-size): Set spam-stat-dirty.
(spam-stat-save): Accept prefix argument.
......@@ -4164,17 +4197,17 @@
* gnus-sum.el (gnus-newsgroup-variables): Doc fix.
2004-08-26 YAGI Tatsuya <ynyaaa@ybb.ne.jp> (tiny change)
2004-08-26 YAGI Tatsuya <ynyaaa@ybb.ne.jp> (tiny change)
* gnus-art.el (gnus-article-next-page): Fix the way to find a real
end-of-buffer.
2004-08-26 Stefan Wiens <s.wi@gmx.net> (tiny change)
2004-08-26 Stefan Wiens <s.wi@gmx.net> (tiny change)
* gnus-sum.el (gnus-read-header): Don't remove a header for the
parent article of a sparse article in the thread hashtb.
2004-08-26 David Hedbor <dhedbor@real.com> (tiny change)
2004-08-26 David Hedbor <dhedbor@real.com> (tiny change)
* nnmail.el (nnmail-split-lowercase-expanded): New user option.
(nnmail-expand-newtext): Lowercase expanded entries if
......@@ -4370,7 +4403,7 @@
* gnus-msg.el (gnus-summary-followup-with-original):
Document yanking of region when active.
2004-04-13 Kevin Greiner <kgreiner@xpediantsolutions.com>
2004-04-13 Kevin Greiner <kgreiner@xpediantsolutions.com>
* gnus-agent.el: Merged 7.3 through 7.7 updates into branch.
Revision 7.2 changes excluded to maintain compatibility with all
......
This diff is collapsed.
......@@ -218,7 +218,7 @@ time Emacs has been idle for IDLE `gnus-demon-timestep's."
(< idle gnus-demon-idle-time)) ; Idle timed out.
(t (< 0 gnus-demon-idle-time)))) ; Or just need to be idle.
;; So we call the handler.
(with-local-quit
(gnus-with-local-quit
(ignore-errors (funcall (car handler)))
;; And reset the timer.
(setcar (nthcdr 1 handler)
......@@ -232,7 +232,7 @@ time Emacs has been idle for IDLE `gnus-demon-timestep's."
(gnus-demon-is-idle-p))
;; We want to call this handler each and every time that
;; Emacs is idle.
(with-local-quit
(gnus-with-local-quit
(ignore-errors (funcall (car handler)))))
(t
;; We want to call this handler only if Emacs has been idle
......@@ -240,7 +240,7 @@ time Emacs has been idle for IDLE `gnus-demon-timestep's."
(and (not (memq (car handler) gnus-demon-idle-has-been-called))
(< idle gnus-demon-idle-time)
(gnus-demon-is-idle-p)
(with-local-quit
(gnus-with-local-quit
(ignore-errors (funcall (car handler)))
;; Make sure the handler won't be called once more in
;; this idle-cycle.
......
......@@ -60,6 +60,7 @@
(require 'gnus)
(require 'gnus-int)
(require 'gnus-sum)
(require 'gnus-util)
(require 'nnmail)
(defvar gnus-registry-dirty t
......@@ -243,7 +244,8 @@ way."
(gnus-registry-clean-empty-function))
;; now trim the registry appropriately
(setq gnus-registry-alist (gnus-registry-trim
(hashtable-to-alist gnus-registry-hashtb)))
(gnus-hashtable-to-alist
gnus-registry-hashtb)))
;; really save
(gnus-registry-cache-save)
(setq gnus-registry-entry-caching caching)
......@@ -262,7 +264,7 @@ way."
(defun gnus-registry-read ()
(gnus-registry-cache-read)
(setq gnus-registry-hashtb (alist-to-hashtable gnus-registry-alist))
(setq gnus-registry-hashtb (gnus-alist-to-hashtable gnus-registry-alist))
(setq gnus-registry-dirty nil))
(defun gnus-registry-trim (alist)
......@@ -290,26 +292,6 @@ way."
(cdr (gethash (car a) timehash))
(cdr (gethash (car b) timehash))))))))))
(defun alist-to-hashtable (alist)
"Build a hashtable from the values in ALIST."
(let ((ht (make-hash-table
:size 4096
:test 'equal)))
(mapc
(lambda (kv-pair)
(puthash (car kv-pair) (cdr kv-pair) ht))
alist)
ht))
(defun hashtable-to-alist (hash)
"Build an alist from the values in HASH."
(let ((list nil))
(maphash
(lambda (key value)
(setq list (cons (cons key value) list)))
hash)
list))
(defun gnus-registry-action (action data-header from &optional to method)
(let* ((id (mail-header-id data-header))
(subject (gnus-registry-simplify-subject
......@@ -660,7 +642,7 @@ Returns the first place where the trail finds a group name."
"Clear the Gnus registry."
(interactive)
(setq gnus-registry-alist nil)
(setq gnus-registry-hashtb (alist-to-hashtable gnus-registry-alist))
(setq gnus-registry-hashtb (gnus-alist-to-hashtable gnus-registry-alist))
(setq gnus-registry-dirty t))
;;;###autoload
......
......@@ -2438,7 +2438,7 @@ gnus-summary-show-article-from-menu-as-charset-%s" cs))))
["Unread" gnus-summary-limit-to-unread t]
["Unseen" gnus-summary-limit-to-unseen t]
["Non-dormant" gnus-summary-limit-exclude-dormant t]
["Next articles" gnus-summary-limit-to-articles t]
["Next or process marked articles" gnus-summary-limit-to-articles t]
["Pop limit" gnus-summary-pop-limit t]
["Show dormant" gnus-summary-limit-include-dormant t]
["Hide childless dormant"
......
......@@ -746,6 +746,28 @@ If there's no subdirectory, delete DIRECTORY as well."
(unless dir
(delete-directory directory)))))
;; The following two functions are used in gnus-registry.
;; They were contributed by Andreas Fuchs <asf@void.at>.
(defun gnus-alist-to-hashtable (alist)
"Build a hashtable from the values in ALIST."
(let ((ht (make-hash-table
:size 4096
:test 'equal)))
(mapc
(lambda (kv-pair)
(puthash (car kv-pair) (cdr kv-pair) ht))
alist)
ht))
(defun gnus-hashtable-to-alist (hash)
"Build an alist from the values in HASH."
(let ((list nil))
(maphash
(lambda (key value)
(setq list (cons (cons key value) list)))
hash)
list))
(defun gnus-strip-whitespace (string)
"Return STRING stripped of all whitespace."
(while (string-match "[\r\n\t ]+" string)
......@@ -1616,6 +1638,25 @@ empty directories from OLD-PATH."
(defalias 'gnus-set-process-query-on-exit-flag
'process-kill-without-query))
(if (fboundp 'with-local-quit)
(defalias 'gnus-with-local-quit 'with-local-quit)
(defmacro gnus-with-local-quit (&rest body)
"Execute BODY, allowing quits to terminate BODY but not escape further.
When a quit terminates BODY, `gnus-with-local-quit' returns nil but
requests another quit. That quit will be processed as soon as quitting
is allowed once again. (Immediately, if `inhibit-quit' is nil.)"
;;(declare (debug t) (indent 0))
`(condition-case nil
(let ((inhibit-quit nil))
,@body)
(quit (setq quit-flag t)
;; This call is to give a chance to handle quit-flag
;; in case inhibit-quit is nil.
;; Without this, it will not be handled until the next function
;; call, and that might allow it to exit thru a condition-case
;; that intends to handle the quit signal next time.
(eval '(ignore nil))))))
(provide 'gnus-util)
;;; arch-tag: f94991af-d32b-4c97-8c26-ca12a934de49
......
......@@ -75,22 +75,22 @@
(defcustom pop3-authentication-scheme 'pass
"*POP3 authentication scheme.
Defaults to 'pass, for the standard USER/PASS authentication. Other valid
values are 'apop."
:version "22.1" ;; Oort Gnus
:type '(choice (const :tag "USER/PASS" pass)
Defaults to `pass', for the standard USER/PASS authentication. The other
valid value is 'apop'."
:type '(choice (const :tag "Normal user/password" pass)
(const :tag "APOP" apop))
:version "22.1" ;; Oort Gnus
:group 'pop3)
(defcustom pop3-leave-mail-on-server nil
"*Non-nil if the mail is to be left on the POP server after fetching.
If the `pop3-leave-mail-on-server' is non-`nil' the mail is to be
left on the POP server after fetching. Note that POP servers
maintain no state information between sessions, so what the
client believes is there and what is actually there may not match
up. If they do not, then you may get duplicate mails or the
whole thing can fall apart and leave you with a corrupt mailbox."
If `pop3-leave-mail-on-server' is non-nil the mail is to be left
on the POP server after fetching. Note that POP servers maintain
no state information between sessions, so what the client
believes is there and what is actually there may not match up.
If they do not, then you may get duplicate mails or the whole
thing can fall apart and leave you with a corrupt mailbox."
;; We can't use the UILD support from XEmacs mail-lib or cvs.m17n.org:
;; http://thread.gmane.org/v9lld8fml4.fsf@marauder.physik.uni-ulm.de
;; http://thread.gmane.org/b9yy8hzy9ej.fsf@jpl.org
......@@ -170,11 +170,14 @@ Shorter values mean quicker response, but are more CPU intensive.")
(unless pop3-leave-mail-on-server
(pop3-dele process n))
(setq n (+ 1 n))
(if pop3-debug (sit-for 1) (sit-for 0.1))
)
(if pop3-debug (sit-for 1) (sit-for 0.1))) ; why?
(when (and pop3-leave-mail-on-server
(> n 1))
(message "pop3.el doesn't support UIDL. Setting `pop3-leave-mail-on-server'
to %s might not give the result you'd expect." pop3-leave-mail-on-server)
(sit-for 1))
(pop3-quit process))
(kill-buffer crashbuf)
)
(kill-buffer crashbuf))
t)
(defun pop3-get-message-count ()
......@@ -316,6 +319,8 @@ If NOW, use that time instead."
;; Date: 08 Jul 1996 23:22:24 -0400
;; should be
;; Tue Jul 9 09:04:21 1996
;; Fixme: This should use timezone on the date field contents.
(setq date
(cond ((not date)
"Tue Jan 1 00:00:0 1900")
......
2006-10-06 Reiner Steib <Reiner.Steib@gmx.de>
* gnus.texi (Image Enhancements): Update for Emacs 22.
* gnus-faq.texi ([1.3]): Update.
2006-10-06 Richard Stallman <rms@gnu.org>
* faq.texi (Displaying the current line or column): Delete "As of Emacs
......
......@@ -172,13 +172,14 @@ Where and how to get Gnus?
@subsubheading Answer
The latest released version of Gnus isn't included in
Emacs 21, therefor you should get the Gnus tarball from
@uref{http://www.gnus.org/dist/gnus.tar.gz}
or via anonymous FTP from
Gnus is released independent from releases of Emacs and XEmacs.
Therefore, the version bundled with Emacs or the version in XEmacs'
package system might not be up to date (e.g. Gnus 5.9 bundled with Emacs
20 is outdated).
@c
You can get the latest released version of Gnus from
@uref{http://www.gnus.org/dist/gnus.tar.gz} or via anonymous FTP from
@uref{ftp://ftp.gnus.org/pub/gnus/gnus.tar.gz}.
If you use XEmacs instead of Emacs you can use XEmacs'
package system instead.
@node [1.4]
@subsubheading Question 1.4
......
......@@ -9508,6 +9508,20 @@ to your @file{~/.gnus.el} file.
@section Charsets
@cindex charsets
 
@c ;; v9d5mxqhga.fsf@marauder.physik.uni-ulm.de
@c (add-to-list 'gnus-newsgroup-variables 'mm-coding-system-priorities)
@c (setq gnus-parameters
@c '(("^de\\." ;; German language
@c (mm-coding-system-priorities '(iso-8859-1 iso-8859-15 utf-8)))
@c ("^fr\\." ;; French
@c (mm-coding-system-priorities '(iso-8859-15 iso-8859-1 utf-8)))
@c ("^fj\\." ;; Japanese
@c (mm-coding-system-priorities
@c '(iso-8859-1 iso-2022-jp iso-2022-jp-2 shift_jis utf-8)))
@c ("^cz\\." ;; Czech
@c (mm-coding-system-priorities '(iso-8859-2 utf-8)))))
People use different charsets, and we have @acronym{MIME} to let us know what
charsets they use. Or rather, we wish we had. Many people use
newsreaders and mailers that do not understand or use @acronym{MIME}, and
......@@ -22137,8 +22151,8 @@ It takes the group name as a parameter.
@section Image Enhancements
 
XEmacs, as well as Emacs 21@footnote{Emacs 21 on MS Windows doesn't
support images yet.}, is able to display pictures and stuff, so Gnus has
taken advantage of that.
support images, Emacs 22 does.} and up, are able to display pictures and
stuff, so Gnus has taken advantage of that.
 
@menu
* X-Face:: Display a funky, teensy black-and-white image.
......
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