From 34df227d99bf81fc477e14cf79c9a5379906f7e0 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Mon, 6 Mar 2006 22:09:26 +0000 Subject: [PATCH] Synch to No Gnus 200603061918. --- ChangeLog | 6 +++ GNUS-NEWS | 13 ++++--- Makefile.in | 104 +++++++++++++++++++++++++++++++++++++++++++++++++++ lisp/ChangeLog | 17 +++++++++ lisp/gmm-utils.el | 22 ++++++++--- lisp/gnus-art.el | 17 +++++---- lisp/gnus-group.el | 3 +- lisp/nnml.el | 12 ++++-- texi/ChangeLog | 4 ++ texi/gnus-news.el | 8 ++-- texi/gnus-news.texi | 2 +- 11 files changed, 180 insertions(+), 28 deletions(-) diff --git a/ChangeLog b/ChangeLog index c64385d..ff4269b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-03-06 Reiner Steib + + * GNUS-NEWS: Generated. + + * Makefile.in (release-*): New targets. + 2006-02-28 Reiner Steib * todo: Remove nnweb. Add: widget for posting styles, doc string diff --git a/GNUS-NEWS b/GNUS-NEWS index 7aa2789..2dc0295 100644 --- a/GNUS-NEWS +++ b/GNUS-NEWS @@ -1,6 +1,6 @@ GNUS NEWS -- history of user-visible changes. -Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, - 2005, 2006 Free Software Foundation, Inc. +Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. See the end for copying conditions. Please send Gnus bug reports to bugs@gnus.org. @@ -34,7 +34,7 @@ data in `~/.newsrc.eld'. `gnus-picon-style'. *Note Picons::. ** You can import and export your RSS subscriptions from OPML files. -*Note RSS::. + *Note RSS::. ** The option `mm-fill-flowed' can be used to disable treatment of format=flowed messages. Also, flowed text is disabled when sending @@ -143,14 +143,17 @@ Gnus will connect to the news host by way of the intermediate host ** You can change the location of XEmacs' toolbars in Gnus buffers. See `gnus-use-toolbar' and `message-use-toolbar'. +** The nnml back end allows other compression programs beside `gzip' for +compressed message files. *Note Mail Spool::. + * For older news, see Gnus info node "New Features". ---------------------------------------------------------------------- Copyright information: -Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, - 2005, 2006 Free Software Foundation, Inc. +Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. Permission is granted to anyone to make or distribute verbatim copies of this document as received, in any medium, provided that the diff --git a/Makefile.in b/Makefile.in index 54cfddb..f6baef8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -35,6 +35,35 @@ EXAMINE_PACKAGEDIR = $(XEMACS) -batch -q -no-site-file -eval \ dirs (cdr dirs)))) \ (princ (or package-dir \"\")))" 2>/dev/null +# # # # # # # # # # Release variables (for maintainer only): +# +# Release files, not included in CVS: +TAR_BALL_EXTRA = README +# Files removed from `cvs export' output before creating the tar-ball: +CVS_IGNORE_FILES = .cvsignore contrib/.cvsignore etc/.cvsignore \ + lisp/.cvsignore texi/.cvsignore +# Name and mail address in ChangeLog format for the release commit: +COMMITTER = Lars Magne Ingebrigtsen +# CODENAME for development releases (CODENAME must have a trailing space, +# (e.g. "Oort ") +CODENAME = +# Files with hard-coded versions numbers: +RELEASE_COMMIT_FILES = lisp/ChangeLog lisp/gnus.el \ + texi/ChangeLog texi/gnus.texi texi/message.texi texi/gnus-faq.texi +# Pattern matching previous version(s): +OLD_PATTERN = 5.10.[0-9]* +# CVS tag of the previous version: +OLD_TAG = v5-10-6 +# CVS tag of the current release: +TAG = v5-10 +# +# Procedure: +# - release-bump-version +# - release-commit +# - release-files +# +# # # # # # # # # # End of release variables + all: lick info all-ja: lick info info-ja @@ -223,6 +252,81 @@ $(srcdir)/configure: $(srcdir)/configure.in Makefile: $(srcdir)/Makefile.in config.status CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status +# # # # # # # # # # Release targets (for maintainer only): + +release-check-settings: + @echo + @echo "COMMITTER = '$(COMMITTER)'" + @echo " (example: 'Foo Bar ')" + @echo "VERSION = '$(VERSION)' (example: '5.10.6')" + @echo "CODENAME = '$(CODENAME)' (example: 'Oort ')" + @echo "TAG = '$(TAG)' (example: 'v5-10-6')" + @echo "OLDTAG = '$(OLDTAG)' (example: 'v5-10-5')" + @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 + +# Needs GNU grep and a recent GNU sed: +release-bump-version: release-check-settings + sed -i -e '/^(defconst gnus-version-number /s|"$(OLD_PATTERN)"|"$(VERSION)"|' lisp/gnus.el + sed -i -e '/^.newcommand{.gnusversionname}{Gnus v/s|$(OLD_PATTERN)|$(VERSION)|' texi/gnus.texi + sed -i -e '/^This manual corresponds to Gnus v/s|$(OLD_PATTERN)|$(VERSION)|' texi/gnus.texi + sed -i -e '/^This manual corresponds to Message v/s|$(OLD_PATTERN)|$(VERSION)|' texi/message.texi + sed -i -e '/The current release ($(OLD_PATTERN)) should/s|$(OLD_PATTERN)|$(VERSION)|' texi/gnus-faq.texi + @if grep -q "$(CODENAME)Gnus v$(VERSION) is released" texi/ChangeLog; then \ + echo "texi/ChangeLog is already updated"; \ + else \ + sed -i -e "1s|^|`date -I` $(COMMITTER)\n\n\t* gnus.texi, gnus-faq.texi, message.texi: $(CODENAME)Gnus v$(VERSION) is released.\n\n|" texi/ChangeLog; \ + fi + @if grep -q "$(CODENAME)Gnus v$(VERSION) is released" lisp/ChangeLog; then \ + echo "lisp/ChangeLog is already updated"; \ + else \ + sed -i -e "1s|^|`date -I` $(COMMITTER)\n\n\t* gnus.el: $(CODENAME)Gnus v$(VERSION) is released.\n\n|" lisp/ChangeLog; \ + fi + cvs diff -U0 $(RELEASE_COMMIT_FILES); sleep 2 + +release-revert-changelog: + rm -i lisp/ChangeLog texi/ChangeLog + cvs update lisp/ChangeLog texi/ChangeLog + +release-commit: release-check-settings + @echo -e '\007' + @echo + @echo "Really do the release-commit for $(CODENAME)Gnus v$(VERSION)?" + @echo + @echo "Hit RET to continue or Ctrl-C to abort." + @echo + @read dummy + cvs commit -m "$(CODENAME)Gnus v$(VERSION) is released." $(RELEASE_COMMIT_FILES) + @echo + @echo "Add tag $(TAG) to CVS?" + @echo "Hit RET to continue or Ctrl-C to abort." + @echo + @read dummy + cvs tag $(TAG) + +release-files: release-cvs-export release-make-tar-ball release-diff + +release-cvs-export gnus-$(TAG): release-check-settings + cvs export -d gnus-$(TAG) -r $(TAG) gnus + +release-make-tar-ball: gnus-$(TAG) $(TAR_BALL_EXTRA) + [ -d gnus-$(TAG) ] && cd gnus-$(TAG) && \ + rm $(CVS_IGNORE_FILES) || true + tar zcvf gnus-$(TAG).tar.gz gnus-$(TAG) + +# Make a diff between current and previous release. Example: +# ftp://quimby.gnus.org/pub/gnus/ding-patches/gnus-5.10.5-5.10.6.diff.gz +release-diff: release-check-settings + cvs diff -r $(OLD_TAG) -r $(TAG) > temp.diff || true + mv temp.diff gnus-`echo $(OLD_TAG)%$(TAG)|tr - .|tr -d v|tr % -`.diff + gzip gnus-`echo $(OLD_TAG)%$(TAG)|tr - .|tr -d v|tr % -`.diff + +release-post-clean: release-check-settings + rm -fr gnus-$(TAG) temp.diff + +# # # # # # # # # # End of release targets + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c683e6c..2d0a60a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,22 @@ 2006-03-06 Reiner Steib + * gmm-utils.el (gmm-image-load-path): Add alias. + + * nnml.el (nnml-generate-nov-databases-directory): Rename from + nnml-generate-nov-databases-1. + (nnml-generate-nov-databases): Use it. + (nnml-generate-nov-databases-directory): Document no-active + argument. + + * gmm-utils.el (gmm-image-load-path-for-library): Return single + directory if path is t. Add no-error. + + * gnus-group.el (gnus-group-make-tool-bar): Use add-hook. + Suggested by Stefan Monnier . + + * gnus-art.el (gnus-article-browse-delete-temp-files): Simplify + resetting gnus-article-browse-html-temp-list. + * gmm-utils.el (gmm-image-load-path-for-library): Sync with mh-compat.el revision 1.9 in Emacs. Rename `gmm-image-load-path'. Add example to docstring. Rename local variables. Move error diff --git a/lisp/gmm-utils.el b/lisp/gmm-utils.el index c519a16..6308fed 100644 --- a/lisp/gmm-utils.el +++ b/lisp/gmm-utils.el @@ -299,7 +299,7 @@ This function returns nil on those systems." ;; From MH-E with modifications: (gmm-defun-compat gmm-image-load-path-for-library - image-load-path-for-library (library image &optional path) + image-load-path-for-library (library image &optional path no-error) "Return a suitable search path for images relative to LIBRARY. Images for LIBRARY are searched for in \"../../etc/images\" and @@ -307,8 +307,12 @@ Images for LIBRARY are searched for in \"../../etc/images\" and well as in `image-load-path' and `load-path'. This function returns the value of `load-path' augmented with the -path to IMAGE. If PATH is given, it is used instead of -`load-path'. +path to IMAGE. If PATH is given, it is used instead of +`load-path'. If PATH is t, return a single image directory +instead of a path. + +If NO-ERROR is non-nil, don't signal an error if no suitable path +for can be found. Here is an example that uses a common idiom to provide compatibility with versions of Emacs that lack the variable @@ -362,12 +366,17 @@ This function is used by Emacs versions that don't have (setq img (directory-file-name parent) dir (expand-file-name "../" dir))) (setq image-directory dir))))) + (no-error + ;; In this case we will return a nil element + (gmm-message 1 "Could not find image %s for library %s" image library)) (t (error "Could not find image %s for library %s" image library))) ;; Return augmented `image-load-path' or `load-path'. - (cond ((and path (symbolp path)) - (nconc (list image-directory) + (cond ((eq path t) + image-directory) + ((and path (symbolp path)) + (nconc (list image-directory) (delete image-directory (if (boundp path) (copy-sequence (symbol-value path)) @@ -376,6 +385,9 @@ This function is used by Emacs versions that don't have (nconc (list image-directory) (delete image-directory (copy-sequence load-path))))))) +;; No time to do it right ATM, sorry... +(defalias 'gmm-image-load-path 'gmm-image-load-path-for-library) + (defun gmm-customize-mode (&optional mode) "Customize customization group for MODE. If mode is nil, use `major-mode' of the curent buffer." diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index 9bcad71..a8fd3a1 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -2737,11 +2737,13 @@ summary buffer." (const :tag "Ask" ask) (const :tag "Ask for each file" file))) +;; Cf. mm-postponed-undisplay-list / mm-destroy-postponed-undisplay-list. + (defun gnus-article-browse-delete-temp-files (&optional how) "Delete temp-files created by `gnus-article-browse-html-parts'." - (unless how - (setq how gnus-article-browse-delete-temp)) - (when (and gnus-article-browse-html-temp-list how) + (when (and gnus-article-browse-html-temp-list + (or how + (setq how gnus-article-browse-delete-temp))) (when (and (eq how 'ask) (y-or-n-p (format "Delete all %s temporary HTML file(s)? " @@ -2753,11 +2755,10 @@ summary buffer." ;; `how' is neither `nil', `ask' nor `t' (i.e. `file'): (gnus-y-or-n-p (format "Delete temporary HTML file `%s'? " file)))) - (delete-file file)) - ;; Also remove file from the list when not deleted or if file doesn't - ;; exist anymore. - (setq gnus-article-browse-html-temp-list - (delete file gnus-article-browse-html-temp-list)))) + (delete-file file))) + ;; Also remove file from the list when not deleted or if file doesn't + ;; exist anymore. + (setq gnus-article-browse-html-temp-list nil)) gnus-article-browse-html-temp-list) (defun gnus-article-browse-html-parts (list) diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el index b73bfbb..6839447 100644 --- a/lisp/gnus-group.el +++ b/lisp/gnus-group.el @@ -1145,8 +1145,7 @@ When FORCE, rebuild the tool bar." ;; Why? --rsteib (or (not gnus-group-tool-bar-map) force)) (when gnus-group-redraw-when-idle - (add-to-list (make-local-variable 'post-command-hook) - 'gnus-group-redraw-check)) + (add-hook 'post-command-hook 'gnus-group-redraw-check nil t)) (let* ((load-path (gmm-image-load-path "gnus" "gnus/toggle-subscription.xpm" 'load-path)) diff --git a/lisp/nnml.el b/lisp/nnml.el index f994c6c..dbb9372 100644 --- a/lisp/nnml.el +++ b/lisp/nnml.el @@ -771,12 +771,14 @@ non-nil.") (nnml-open-server server)) (setq nnml-directory (expand-file-name nnml-directory)) ;; Recurse down the directories. - (nnml-generate-nov-databases-1 nnml-directory nil t) + (nnml-generate-nov-databases-directory nnml-directory nil t) ;; Save the active file. (nnmail-save-active nnml-group-alist nnml-active-file)) -(defun nnml-generate-nov-databases-1 (dir &optional seen no-active) - "Regenerate the NOV database in DIR." +(defun nnml-generate-nov-databases-directory (dir &optional seen no-active) + "Regenerate the NOV database in DIR. + +Unless no-active is non-nil, update the active file too." (interactive "DRegenerate NOV in: ") (setq dir (file-name-as-directory dir)) ;; Only scan this sub-tree if we haven't been here yet. @@ -786,7 +788,7 @@ non-nil.") (dolist (dir (directory-files dir t nil t)) (when (and (not (string-match "^\\." (file-name-nondirectory dir))) (file-directory-p dir)) - (nnml-generate-nov-databases-1 dir seen))) + (nnml-generate-nov-databases-directory dir seen))) ;; Do this directory. (let ((files (sort (nnheader-article-to-file-alist dir) 'car-less-than-car))) @@ -1045,6 +1047,8 @@ Use the nov database for the current group if available." ;; #### other backends get a compaction feature. Also, note that invalidating ;; #### the "original article buffer" is already done at an upper level. +;; Shouldn't `nnml-request-compact-group' be interactive? --rsteib + (defun nnml-request-compact-group (group &optional server save) (nnml-possibly-change-directory group server) (unless nnml-article-file-alist diff --git a/texi/ChangeLog b/texi/ChangeLog index 511275b..fd63630 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -1,3 +1,7 @@ +2006-03-06 Reiner Steib + + * gnus-news.el, gnus-news.texi: Update copyright. + 2006-03-03 Reiner Steib * xemacs.mak: Remove outdated file. Use make.bat instead. diff --git a/texi/gnus-news.el b/texi/gnus-news.el index 15150f1..072b6b0 100644 --- a/texi/gnus-news.el +++ b/texi/gnus-news.el @@ -1,5 +1,5 @@ ;;; gnus-news.el --- a hack to create GNUS-NEWS from texinfo source -;; Copyright (C) 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Reiner Steib ;; Keywords: tools @@ -27,7 +27,8 @@ (defvar gnus-news-header-disclaimer "GNUS NEWS -- history of user-visible changes. -Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. See the end for copying conditions. Please send Gnus bug reports to bugs\@gnus.org. @@ -45,7 +46,8 @@ For older news, see Gnus info node \"New Features\". ---------------------------------------------------------------------- Copyright information: -Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, + 2006 Free Software Foundation, Inc. Permission is granted to anyone to make or distribute verbatim copies of this document as received, in any medium, provided that the diff --git a/texi/gnus-news.texi b/texi/gnus-news.texi index b620a17..142c6be 100644 --- a/texi/gnus-news.texi +++ b/texi/gnus-news.texi @@ -1,6 +1,6 @@ @c -*-texinfo-*- -@c Copyright (C) 2004, 2005 Free Software Foundation, Inc. +@c Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc. @c Permission is granted to anyone to make or distribute verbatim copies @c of this document as received, in any medium, provided that the -- 1.7.10.4