From e2c9efb05a1ae9e65fd40bab80466da331f3981b Mon Sep 17 00:00:00 2001 From: Miles Bader Date: Thu, 22 Jan 2009 07:02:19 +0000 Subject: [PATCH] Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 1506-1507, 1512-1513, 1515, 1517, 1519-1520) - Update from CVS - Merge from gnus--devo--0 2009-01-06 Tassilo Horn * lisp/gnus-art.el (gnus-treat-display-face): Fix docstring link to point to `(gnus)Face', not `(gnus)X-Face'. 2009-01-03 Michael Olson * lisp/nnimap.el (nnimap-retrieve-headers-progress): Handle edge case where `headers' is nil. This can occur if the IMAP server does not have permissions to read messages from a folder, but can write new messages to the folder. (nnimap-request-article-part): Do not insert `data' if it is nil. * lisp/imap.el (imap-parse-fetch): Courier can insert spurious blank characters which will confuse `read', so skip past them. Revision: emacs@sv.gnu.org/gnus--devo--0--patch-574 --- .dir-locals.el | 9 +++++++++ ChangeLog | 6 +++++- GNUS-NEWS | 2 +- contrib/sendmail.el | 4 ++-- contrib/smtpmail.el | 2 +- etc/gnus-tut.txt | 2 +- etc/images/README | 6 +++--- etc/images/gnus/README | 6 +++--- etc/images/gnus/gnus.svg | 2 +- etc/images/smilies/README | 2 +- etc/images/smilies/grayscale/README | 2 +- etc/images/smilies/medium/README | 2 +- etc/images/splash.svg | 2 +- lisp/ChangeLog | 27 +++++++++++++++++++++++++++ lisp/ChangeLog.2 | 2 +- lisp/auth-source.el | 2 +- lisp/binhex.el | 2 +- lisp/canlock.el | 2 +- lisp/compface.el | 2 +- lisp/deuglify.el | 6 +++--- lisp/dig.el | 2 +- lisp/dns-mode.el | 4 +++- lisp/dns.el | 2 +- lisp/earcon.el | 2 +- lisp/ecomplete.el | 2 +- lisp/flow-fill.el | 2 +- lisp/format-spec.el | 2 +- lisp/gmm-utils.el | 2 +- lisp/gnus-agent.el | 2 +- lisp/gnus-art.el | 2 +- lisp/gnus-async.el | 2 +- lisp/gnus-audio.el | 2 +- lisp/gnus-bcklg.el | 2 +- lisp/gnus-bookmark.el | 2 +- lisp/gnus-cache.el | 2 +- lisp/gnus-cite.el | 2 +- lisp/gnus-cus.el | 2 +- lisp/gnus-delay.el | 2 +- lisp/gnus-demon.el | 2 +- lisp/gnus-diary.el | 2 +- lisp/gnus-dired.el | 2 +- lisp/gnus-draft.el | 2 +- lisp/gnus-dup.el | 2 +- lisp/gnus-eform.el | 2 +- lisp/gnus-ems.el | 2 +- lisp/gnus-fun.el | 2 +- lisp/gnus-group.el | 2 +- lisp/gnus-int.el | 2 +- lisp/gnus-kill.el | 2 +- lisp/gnus-logic.el | 2 +- lisp/gnus-mh.el | 2 +- lisp/gnus-ml.el | 2 +- lisp/gnus-mlspl.el | 2 +- lisp/gnus-move.el | 2 +- lisp/gnus-msg.el | 2 +- lisp/gnus-nocem.el | 2 +- lisp/gnus-picon.el | 2 +- lisp/gnus-range.el | 2 +- lisp/gnus-registry.el | 2 +- lisp/gnus-salt.el | 2 +- lisp/gnus-score.el | 2 +- lisp/gnus-setup.el | 2 +- lisp/gnus-sieve.el | 2 +- lisp/gnus-soup.el | 2 +- lisp/gnus-spec.el | 2 +- lisp/gnus-srvr.el | 2 +- lisp/gnus-start.el | 2 +- lisp/gnus-topic.el | 2 +- lisp/gnus-undo.el | 2 +- lisp/gnus-util.el | 2 +- lisp/gnus-uu.el | 2 +- lisp/gnus-vm.el | 2 +- lisp/gnus-win.el | 2 +- lisp/gnus.el | 2 +- lisp/hashcash.el | 2 +- lisp/hex-util.el | 2 +- lisp/hmac-def.el | 2 +- lisp/hmac-md5.el | 2 +- lisp/html2text.el | 2 +- lisp/ietf-drums.el | 2 +- lisp/imap.el | 6 +++++- lisp/legacy-gnus-agent.el | 2 +- lisp/mail-parse.el | 2 +- lisp/mail-prsvr.el | 2 +- lisp/mail-source.el | 2 +- lisp/mailcap.el | 2 +- lisp/md4.el | 2 +- lisp/messcompat.el | 2 +- lisp/mm-bodies.el | 2 +- lisp/mm-decode.el | 2 +- lisp/mm-encode.el | 2 +- lisp/mm-extern.el | 2 +- lisp/mm-partial.el | 2 +- lisp/mm-uu.el | 2 +- lisp/mm-view.el | 2 +- lisp/mml-sec.el | 2 +- lisp/mml-smime.el | 2 +- lisp/mml.el | 2 +- lisp/mml1991.el | 2 +- lisp/mml2015.el | 2 +- lisp/netrc.el | 2 +- lisp/nnagent.el | 2 +- lisp/nnbabyl.el | 2 +- lisp/nndb.el | 2 +- lisp/nndiary.el | 2 +- lisp/nndir.el | 2 +- lisp/nndoc.el | 2 +- lisp/nndraft.el | 2 +- lisp/nneething.el | 2 +- lisp/nngateway.el | 2 +- lisp/nnheader.el | 2 +- lisp/nnimap.el | 11 +++++++---- lisp/nnir.el | 2 +- lisp/nnkiboze.el | 2 +- lisp/nnlistserv.el | 2 +- lisp/nnmail.el | 2 +- lisp/nnmairix.el | 2 +- lisp/nnmbox.el | 2 +- lisp/nnmh.el | 2 +- lisp/nnml.el | 2 +- lisp/nnoo.el | 2 +- lisp/nnrss.el | 2 +- lisp/nnslashdot.el | 2 +- lisp/nnsoup.el | 2 +- lisp/nnspool.el | 2 +- lisp/nntp.el | 2 +- lisp/nnultimate.el | 2 +- lisp/nnvirtual.el | 2 +- lisp/nnwarchive.el | 2 +- lisp/nnweb.el | 2 +- lisp/nnwfm.el | 2 +- lisp/ntlm.el | 2 +- lisp/parse-time.el | 2 +- lisp/password-cache.el | 2 +- lisp/pgg-def.el | 2 +- lisp/pgg-gpg.el | 2 +- lisp/pgg-parse.el | 2 +- lisp/pgg-pgp.el | 2 +- lisp/pgg-pgp5.el | 2 +- lisp/pgg.el | 5 ++++- lisp/pop3.el | 2 +- lisp/qp.el | 2 +- lisp/rfc1843.el | 2 +- lisp/rfc2045.el | 2 +- lisp/rfc2047.el | 2 +- lisp/rfc2104.el | 2 +- lisp/rfc2231.el | 2 +- lisp/sasl-cram.el | 2 +- lisp/sasl-digest.el | 2 +- lisp/sasl-ntlm.el | 2 +- lisp/sasl.el | 2 +- lisp/score-mode.el | 2 +- lisp/sha1.el | 2 +- lisp/sieve-manage.el | 2 +- lisp/sieve-mode.el | 2 +- lisp/sieve.el | 2 +- lisp/smiley.el | 2 +- lisp/smime.el | 2 +- lisp/spam-report.el | 2 +- lisp/spam-stat.el | 2 +- lisp/spam-wash.el | 2 +- lisp/spam.el | 2 +- lisp/starttls.el | 2 +- lisp/tls.el | 2 +- lisp/utf7.el | 2 +- lisp/uudecode.el | 2 +- lisp/webmail.el | 2 +- lisp/yenc.el | 2 +- texi/doclicense.texi | 2 +- texi/emacs-mime.texi | 2 +- texi/gnus-coding.texi | 2 +- texi/gnus-faq.texi | 2 +- texi/gnus-logo.eps | 2 +- texi/gnus-news.el | 4 ++-- texi/gnus-news.texi | 2 +- texi/message.texi | 2 +- texi/pgg.texi | 2 +- texi/sasl.texi | 2 +- texi/sieve.texi | 2 +- 179 files changed, 240 insertions(+), 188 deletions(-) create mode 100644 .dir-locals.el diff --git a/.dir-locals.el b/.dir-locals.el new file mode 100644 index 000000000..4e9f8b647 --- /dev/null +++ b/.dir-locals.el @@ -0,0 +1,9 @@ +((nil . ((tab-width . 8) + (fill-column . 70))) + (c-mode . ((c-file-style . "GNU"))) + (change-log-mode . ((add-log-time-zone-rule . t) + (fill-column . 74) + (bug-reference-url-format + . "http://emacsbugs.donarmstrong.com/cgi-bin/bugreport.cgi?bug=%s")))) + +;; arch-tag: fb93c160-e9fe-4184-aad1-e4f5daa11cbd diff --git a/ChangeLog b/ChangeLog index 802d519c7..af765d48a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2009-01-22 Dan Nicolaescu + + * .dir-locals.el: New file. + 2009-01-03 Reiner Steib * README: Add outline. Clarify Emacs versions. @@ -818,7 +822,7 @@ Windows NT. Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, - 2007, 2008 Free Software Foundation, Inc. + 2007, 2008, 2009 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/GNUS-NEWS b/GNUS-NEWS index 65c102338..60c7ebf27 100644 --- a/GNUS-NEWS +++ b/GNUS-NEWS @@ -1,7 +1,7 @@ GNUS NEWS -- history of user-visible changes. Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, - 2006, 2007, 2008 Free Software Foundation, Inc. + 2006, 2007, 2008, 2009 Free Software Foundation, Inc. See the end of the file for license conditions. Please send Gnus bug reports to bugs@gnus.org. diff --git a/contrib/sendmail.el b/contrib/sendmail.el index 4694c1551..c2df45411 100644 --- a/contrib/sendmail.el +++ b/contrib/sendmail.el @@ -1,7 +1,7 @@ ;;; sendmail.el --- mail sending commands for Emacs. -*- byte-compile-dynamic: t -*- ;; Copyright (C) 1985, 1986, 1992, 1993, 1994, 1995, 1996, 1998, 2000, -;; 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +;; 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 ;; Free Software Foundation, Inc. ;; Maintainer: FSF @@ -790,7 +790,7 @@ Prefix arg means don't delete this window." (not (one-window-p)) (with-current-buffer (window-buffer (next-window (selected-window) 'not)) - (setq rmail-flag (eq major-mode 'rmail-mode)) + (setq rmail-flag (memq major-mode '(rmail-mode pmail-mode))) (setq summary-buffer (and mail-bury-selects-summary (boundp 'rmail-summary-buffer) diff --git a/contrib/smtpmail.el b/contrib/smtpmail.el index 3e40bc110..6ac7d7650 100644 --- a/contrib/smtpmail.el +++ b/contrib/smtpmail.el @@ -1,7 +1,7 @@ ;;; smtpmail.el --- simple SMTP protocol (RFC 821) for sending mail ;; Copyright (C) 1995, 1996, 2001, 2002, 2003, 2004, 2005, 2006, 2007, -;; 2008 Free Software Foundation, Inc. +;; 2008, 2009 Free Software Foundation, Inc. ;; Author: Tomoji Kagatani ;; Maintainer: Simon Josefsson diff --git a/etc/gnus-tut.txt b/etc/gnus-tut.txt index 31e4733e5..d4b49eb2b 100644 --- a/etc/gnus-tut.txt +++ b/etc/gnus-tut.txt @@ -26,7 +26,7 @@ heart's delight at and . ;; Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005, 2006, 2007, -;; 2008 Free Software Foundation, Inc. +;; 2008, 2009 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news diff --git a/etc/images/README b/etc/images/README index d4ca581f6..865984eec 100644 --- a/etc/images/README +++ b/etc/images/README @@ -23,17 +23,17 @@ COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES File: mh-logo.xpm Author: Satyaki Das - Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 + Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. Files: splash.pbm, splash.xpm, gnus.pbm Author: Luis Fernandes - Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 + Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. Files: splash.png, splash.svg Author: Francesc Rocher - Copyright (C) 2008 Free Software Foundation, Inc. + Copyright (C) 2008, 2009 Free Software Foundation, Inc. * The following icons are from GTK+ 2.x. They are not part of Emacs, but diff --git a/etc/images/gnus/README b/etc/images/gnus/README index 2b5823819..10a0db551 100644 --- a/etc/images/gnus/README +++ b/etc/images/gnus/README @@ -7,7 +7,7 @@ COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES Files: important.xpm, unimportant.xpm Author: Simon Josefsson -Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. Files: catchup.pbm catchup.xpm cu-exit.pbm cu-exit.xpm @@ -22,12 +22,12 @@ Files: catchup.pbm catchup.xpm cu-exit.pbm cu-exit.xpm unsubscribe.pbm unsubscribe.xpm uu-decode.pbm uu-decode.xpm uu-post.pbm uu-post.xpm Author: Luis Fernandes -Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. Files: gnus.png, gnus.svg Author: Francesc Rocher - Copyright (C) 2008 Free Software Foundation, Inc. + Copyright (C) 2008, 2009 Free Software Foundation, Inc. * The following icons are from GNOME 2.x. They are not part of Emacs, diff --git a/etc/images/gnus/gnus.svg b/etc/images/gnus/gnus.svg index da3d413a0..3e17b43ee 100644 --- a/etc/images/gnus/gnus.svg +++ b/etc/images/gnus/gnus.svg @@ -1,7 +1,7 @@