From 0e7fab9fc1a007b2cd93dbac50da31aa2690ca6b Mon Sep 17 00:00:00 2001 From: Miles Bader Date: Sun, 20 Apr 2008 23:38:58 +0000 Subject: [PATCH] Merge from gnus--rel--5.10 Patches applied: * gnus--rel--5.10 (patch 288-290) - Update from CVS 2008-04-12 Reiner Steib * Makefile.in (release-check-settings): Clarify codename. (release-help): New target. (release-cvs-export): Add umask. Suggested by Sven Joachim. 2008-04-12 Reiner Steib * lisp/gnus-diary.el (gnus-article-edit-mode-map, message-mode-map): Remove binding for `gnus-diary-version'. Bind `gnus-diary-check-message' to `C-c C-f d'. 2008-04-12 Adrian Aichner * lisp/gnus-sum.el (gnus-summary-goto-subject): Typo fix. 2008-03-31 Katsumi Yamaoka * lisp/Makefile.in (EMACS_COMP): Quote directory name that might contain whitespace. 2008-04-13 Reiner Steib * texi/gnus.texi (Oort Gnus): Add message-fill-column. 2008-04-12 Adrian Aichner * texi/gnus.texi (Mail Source Specifiers): Typo fix. 2008-04-12 Reiner Steib * texi/gnus.texi (Diary Headers Generation): Update key binding for `gnus-diary-check-message'. Revision: emacs@sv.gnu.org/gnus--devo--0--patch-479 --- ChangeLog | 6 ++++++ Makefile.in | 42 +++++++++++++++++++++++++++++++++--------- lisp/ChangeLog | 15 +++++++++++++++ lisp/gnus-diary.el | 8 ++------ lisp/gnus-sum.el | 2 +- lisp/message.el | 1 + texi/ChangeLog | 25 +++++++++++++++++++++++-- texi/gnus.texi | 20 +++++++++++++------- 8 files changed, 94 insertions(+), 25 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1d8015267..ca4561e37 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-04-12 Reiner Steib + + * Makefile.in (release-check-settings): Clarify codename. + (release-help): New target. + (release-cvs-export): Add umask. Suggested by Sven Joachim. + 2008-04-11 Reiner Steib * README: Bump version to 0.9. diff --git a/Makefile.in b/Makefile.in index 38835db09..9c7c7cbb7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -40,12 +40,6 @@ OLD_TAG = v5-10-6 TAG = v5-10 # COMMIT_STRING = $(CODENAME)Gnus v$(VERSION) is released. -# -# Procedure: -# - release-bump-version -# - release-commit -# - release-files or release-files-signed -# # # # # # # # # # # End of release variables all: lick info @@ -112,11 +106,13 @@ release-check-settings: @echo "COMMITTER = '$(COMMITTER)'" @echo " (example: 'Foo Bar ')" @echo "VERSION = '$(VERSION)' (example: '5.10.6')" - @echo "CODENAME = '$(CODENAME)' (example: 'No ')" - @echo "CIN = '$(CIN)' (example: 'n', codename initial)" @echo "TAG = '$(TAG)' (example: 'v5-10-6')" @echo "OLD_TAG = '$(OLD_TAG)' (example: 'v5-10-5')" @echo + @echo "# Only for development versions:" + @echo "CODENAME = '$(CODENAME)' (example: 'No ')" + @echo "CIN = '$(CIN)' (example: 'n', codename initial)" + @echo @if [ x"$(VERSION)" = x ]; then echo "error: No VERSION given."; exit 1; else :; fi @if [ x"$(TAG)" = x ]; then echo "error: No TAG given."; exit 1; else :; fi @echo @@ -128,6 +124,34 @@ release-check-settings: @echo release-commit @echo release-files or release-files-signed +release-help: + @echo "Available targets for releases:" + @echo + @echo "[0] release-help" + @echo " Display this help message." + @echo + @echo "[1] release-check-settings" + @echo " Check it all required variables are specified on the command line." + @echo " Run this target to display the variable names and current values." + @echo + @echo "[2] release-bump-version" + @echo " Bump the version to VERSION" + @echo + @echo "[3] release-add-changelog" + @echo " Add COMMITTER and COMMIT_STRING to the ChangeLogs." + @echo + @echo "[4] release-commit" + @echo " Commit the ChangeLogs and tag repository with TAG." + @echo + @echo "[5] release-files or release-files-signed" + @echo " Create the release tar-ball and diff file." + @echo " release-files-signed creates detached GPG signature files as well." + @echo + @echo "For a release, steps [1]-[5] need to be done. Immediately after" + @echo "the release, we bump the version again by performing steps [1]-[4]" + @echo "with the next VERSION and TAG." + @echo + bump-version: $(MAKE) COMMIT_STRING='Bump version to $(VERSION).' release-bump-version @@ -237,7 +261,7 @@ release-sign-files: release-cvs-export $(CIN)gnus-$(VERSION): release-check-settings rm -fr $(CIN)gnus-$(VERSION) - cvs export -d $(CIN)gnus-$(VERSION) -r $(TAG) gnus + umask 0022; cvs export -d $(CIN)gnus-$(VERSION) -r $(TAG) gnus release-make-tar-ball: $(CIN)gnus-$(VERSION) [ -d $(CIN)gnus-$(VERSION) ] && cd $(CIN)gnus-$(VERSION) && \ diff --git a/lisp/ChangeLog b/lisp/ChangeLog index cfbfe4411..87065fe9a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -13,6 +13,16 @@ * mm-decode.el (mm-display-external): Make temp file read-only. +2008-04-12 Reiner Steib + + * gnus-diary.el (gnus-article-edit-mode-map, message-mode-map): Remove + binding for `gnus-diary-version'. Bind `gnus-diary-check-message' to + `C-c C-f d'. + +2008-04-12 Adrian Aichner + + * gnus-sum.el (gnus-summary-goto-subject): Typo fix. + 2008-04-11 Reiner Steib * gnus.el: Bump version to 0.9. @@ -71,6 +81,11 @@ to enable bug workaround or not. (nnimap-find-minmax-uid): Only enable workaround conditionally. +2008-03-31 Katsumi Yamaoka + + * Makefile.in (EMACS_COMP): Quote directory name that might contain + whitespace. + 2008-03-29 Sven Joachim * gnus-sum.el (gnus-summary-make-menu-bar): Add missing dots. diff --git a/lisp/gnus-diary.el b/lisp/gnus-diary.el index 15742440b..cd2239a5b 100644 --- a/lisp/gnus-diary.el +++ b/lisp/gnus-diary.el @@ -390,8 +390,8 @@ If ARG (or prefix) is non-nil, force prompting for all fields." (add-hook 'nndiary-request-accept-article-hooks (lambda () (gnus-diary-check-message nil))) -(define-key message-mode-map "\C-cDc" 'gnus-diary-check-message) -(define-key gnus-article-edit-mode-map "\C-cDc" 'gnus-diary-check-message) +(define-key message-mode-map "\C-c\C-fd" 'gnus-diary-check-message) +(define-key gnus-article-edit-mode-map "\C-c\C-fd" 'gnus-diary-check-message) ;; The end ================================================================== @@ -401,10 +401,6 @@ If ARG (or prefix) is non-nil, force prompting for all fields." (interactive) (message "NNDiary version %s" nndiary-version)) -(define-key message-mode-map "\C-cDv" 'gnus-diary-version) -(define-key gnus-article-edit-mode-map "\C-cDv" 'gnus-diary-version) - - (provide 'gnus-diary) ;;; arch-tag: 98467e70-337e-4ddc-b92d-45d403ff1b4b diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el index 7d3d1b878..bdf411e48 100644 --- a/lisp/gnus-sum.el +++ b/lisp/gnus-sum.el @@ -7452,7 +7452,7 @@ If optional argument UNREAD is non-nil, only unread article is selected." (gnus-summary-position-point)) (defun gnus-summary-goto-subject (article &optional force silent) - "Go the subject line of ARTICLE. + "Go to the subject line of ARTICLE. If FORCE, also allow jumping to articles not currently shown." (interactive "nArticle number: ") (unless (numberp article) diff --git a/lisp/message.el b/lisp/message.el index afcb1424d..a86361434 100644 --- a/lisp/message.el +++ b/lisp/message.el @@ -1012,6 +1012,7 @@ Used by `message-yank-original' via `message-yank-cite'." :link '(custom-manual "(message)Insertion Variables") :type 'integer) +;;;###autoload (defcustom message-cite-function 'message-cite-original-without-signature "*Function for citing an original message. Predefined functions include `message-cite-original' and diff --git a/texi/ChangeLog b/texi/ChangeLog index 75b8f6372..318220d6d 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -1,14 +1,35 @@ +2008-04-13 Reiner Steib + + * gnus.texi (Oort Gnus): Add message-fill-column. + +2008-04-12 Adrian Aichner + + * gnus.texi (Mail Source Specifiers): Typo fix. + +2008-04-12 Reiner Steib + + * gnus.texi (Diary Headers Generation): Update key binding for + `gnus-diary-check-message'. + 2008-04-11 Reiner Steib * gnus.texi, gnus-faq.texi, message.texi: Bump version to 0.9. 2008-04-10 Reiner Steib - * gnus.texi, gnus-faq.texi, message.texi: No Gnus v0.8 is released. + * gnus.texi (Emacsen): Addition. 2008-04-10 Reiner Steib - * gnus.texi (Emacsen): Addition. + * gnus.texi (Emacsen): Give recommendations for Emacs 22 and Emacs 23. + +2008-04-10 Reiner Steib + + * gnus.texi, gnus-faq.texi, message.texi: No Gnus v0.8 is released. + +2008-04-09 Reiner Steib + + * gnus.texi (Oort Gnus): Mention customizing of tool bars. 2008-04-09 Reiner Steib diff --git a/texi/gnus.texi b/texi/gnus.texi index 7818a2bef..d57298435 100644 --- a/texi/gnus.texi +++ b/texi/gnus.texi @@ -14564,7 +14564,7 @@ corresponding keywords. @item :mailbox The name of the mailbox to get mail from. The default is @samp{INBOX} -which normally is the mailbox which receive incoming mail. +which normally is the mailbox which receives incoming mail. @item :predicate The predicate used to find articles to fetch. The default, @samp{UNSEEN @@ -18959,9 +18959,9 @@ needed. This function is hooked into the @code{nndiary} back end, so that moving or copying an article to a diary group will trigger it -automatically. It is also bound to @kbd{C-c D c} in @code{message-mode} -and @code{article-edit-mode} in order to ease the process of converting -a usual mail to a diary one. +automatically. It is also bound to @kbd{C-c C-f d} in +@code{message-mode} and @code{article-edit-mode} in order to ease the +process of converting a usual mail to a diary one. This function takes a prefix argument which will force prompting of all diary headers, regardless of their presence or validity. That way, @@ -27929,7 +27929,12 @@ controls this. @item You can now drag and drop attachments to the Message buffer. See @code{mml-dnd-protocol-alist} and @code{mml-dnd-attach-options}. @xref{MIME, ,MIME, message, Message Manual}. -@c New in 5.10.9 / 5.11 +@c New in 5.10.9 / 5.11 (Emacs 21.1) + +@item @code{auto-fill-mode} is enabled by default in Message mode. +See @code{message-fill-column}. @xref{Various Message Variables, , +Message Headers, message, Message Manual}. +@c New in Gnus 5.10.12 / 5.11 (Emacs 22.3) @end itemize @@ -27982,8 +27987,9 @@ message, Message Manual}). @item The tool bars have been updated to use GNOME icons in Group, Summary and -Message mode. You can also customize the tool bars. This is a new -feature in Gnus 5.10.9. (Only for Emacs, not in XEmacs.) +Message mode. You can also customize the tool bars: @kbd{M-x +customize-apropos RET -tool-bar$} should get you started. This is a new +feature in Gnus 5.10.10. (Only for Emacs, not in XEmacs.) @item The tool bar icons are now (de)activated correctly in the group buffer, see the variable @code{gnus-group-update-tool-bar}. -- 2.34.1