From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/55999 Path: main.gmane.org!not-for-mail From: Reiner Steib <4.uce.03.r.s@nurfuerspam.de> Newsgroups: gmane.emacs.gnus.general Subject: Re: Gnus 5.11 in Emacs CVS Date: Tue, 13 Jan 2004 23:22:22 +0100 Organization: Dept. of Theoretical Physics, University of Ulm Sender: ding-owner@lists.math.uh.edu Message-ID: References: Reply-To: Reiner Steib NNTP-Posting-Host: deer.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1074032932 25484 80.91.224.253 (13 Jan 2004 22:28:52 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Tue, 13 Jan 2004 22:28:52 +0000 (UTC) Original-X-From: ding-owner+M4539@lists.math.uh.edu Tue Jan 13 23:28:47 2004 Return-path: Original-Received: from malifon.math.uh.edu ([129.7.128.13]) by deer.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 1AgX1j-0002U0-00 for ; Tue, 13 Jan 2004 23:28:47 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.math.uh.edu) by malifon.math.uh.edu with smtp (Exim 3.20 #1) id 1AgX0g-0004PG-00; Tue, 13 Jan 2004 16:27:42 -0600 Original-Received: from justine.libertine.org ([66.139.78.221] ident=postfix) by malifon.math.uh.edu with esmtp (Exim 3.20 #1) id 1AgX0X-0004P8-00 for ding@lists.math.uh.edu; Tue, 13 Jan 2004 16:27:33 -0600 Original-Received: from main.gmane.org (main.gmane.org [80.91.224.249]) by justine.libertine.org (Postfix) with ESMTP id E7FE53A0033 for ; Tue, 13 Jan 2004 16:27:31 -0600 (CST) Original-Received: from list by main.gmane.org with local (Exim 3.35 #1 (Debian)) id 1AgX0V-0002eG-00 for ; Tue, 13 Jan 2004 23:27:31 +0100 Mail-Followup-To: ding@gnus.org X-Injected-Via-Gmane: http://gmane.org/ Original-To: ding@gnus.org Original-Received: from sea.gmane.org ([80.91.224.252]) by main.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 1AgX0T-0002e6-00 for ; Tue, 13 Jan 2004 23:27:29 +0100 Original-Received: from news by sea.gmane.org with local (Exim 3.35 #1 (Debian)) id 1AgX0T-0006Zu-00 for ; Tue, 13 Jan 2004 23:27:29 +0100 Original-Lines: 155 Original-X-Complaints-To: usenet@sea.gmane.org X-Face: #vK]N[`vqjuod*|)'[iD7/"3AB-ApT%fmN"LWAg@oS7OesGv~)n[OBTLM#I="J'Y^-7I I/ps7o_'IK@#-Rs{::DZ@O8yS|fexe,XslY[:dNWOb~>?mC-&i_c)say:"\IpA.5U.b]'NY;Pks{lb h.+#6%DpZuaK3dcHB`Av3zc:r!C%~s0&m,tWj]&},qg.+0ww2gK%f!:GK|wMl.I!(voY*1"^li8"~B BNG)9LvPi?^DMR-GVDnZqhu*3Hi,+g=wFhI)BL6&u{EOVEHjVEVq~d?_}lMntWAc3(6?kftjc>_f>! g0wM(qPM$d5]^TT_Qyi&L?LGVG)SHN;Gk/,pkY9,~ Mail-Copies-To: nobody User-Agent: Gnus/5.110002 (No Gnus v0.2) Emacs/21.3.50 (gnu/linux) Cancel-Lock: sha1:JJWJc6Q+S9f+OLlWM1iz9MaTiYA= Precedence: bulk Xref: main.gmane.org gmane.emacs.gnus.general:55999 X-Report-Spam: http://spam.gmane.org/gmane.emacs.gnus.general:55999 On Thu, Jan 08 2004, Reiner Steib wrote: > On Tue, Jan 06 2004, Lars Magne Ingebrigtsen wrote: [ Including Gnus 5.11 in Emacs CVS ] >> Some kind soul takes it upon him- or herself to start merging Gnus >> into Emacs. This is quite a bit of work. > > Naively, I would have though that it's more or less placing > [gnus/]lisp files in [emacs]/lisp/gnus and [gnus/]texi in [emacs/]man. I gave it a try and it seems to work nicely. I wrote down the necessary steps as a shell script (see below), that should be run in directory "emacs/" of an Emacs check-out before "make bootstrap". Maybe someone wants to test it too. Some minor problems (see the comments about "load-path shadows" in the script): # Not needed for GNU Emacs (XEmacs compatibility library) $rm gnus/gnus-xmas.el{,c} # Gnus can use the file from calendar/ instead: $rm gnus/parse-time.el{,c} # Gnus can use the file from net/ instead: $rm gnus/netrc.el{,c} The following items should probably be discussed on emacs-devel: # We should probably move gnus/tls.el to net/ $rm net/tls.el{,c} # The version from calendar/ lacks `time-to-number-of-days' $rm calendar/time-date.el{,c} Other items: - What about GNUS-NEWS -> etc/NEWS? Where to put the Gnus items? `**' has to be replaced by `***'. Should the item about "make.bat" be removed (it doesn't make sense for the bundled Gnus, I suppose)? - What about the arch-tags in Emacs CVS? Probably we should ask Miles Bader (who added them) for advice (on emacs-devel)? I still would like to hear comments on the following: > Could someone who did (or helped with) the previous merge (Gnus 5.9 in > Emacs 21) tell a little more about it? Possible problems, pitfalls, > etc.? > > What about all the changes made to Gnus 5.8.8/5.9 [1] in Emacs' CVS? > Probably the changes committed by Dave Love, Jesper Harder, ShengHuo > ZHU or other developers with write access to Gnus' CVS were also > applied to (or synced with) Gnus' CVS. I didn't check, though. [...] > [1] It's not clear to me from the ChangeLog (in Emacs CVS), when this > merge happened. Bye, Reiner. --8<---------------cut here---------------start------------->8--- #!/usr/bin/env bash # With GNU cp, rm, ... : ${rm:="rm -v"} : ${cp:="cp -vp"} old_pwd=`pwd` # Base directory of your unpacked Gnus 5.10.6 source tarball # (must have the subdirs etc/, lisp/ and texi/): : ${Oort_base:="$HOME/src/links/Emacs/gnus/5.10/gnus-5.10.6"} dirs_to_check="$Oort_base/texi $Oort_base/etc $Oort_base/lisp lisp/gnus man" for i in $dirs_to_check; do [ -d "$i" ] || { echo "'$i' is not a directory." echo "Is '$old_pwd' (pwd)" echo "really the base directory of your emacs checkout" echo "and is '$Oort_base' the correct Gnus 5.10.6 directory?" exit 1 } >&2 done manuals="emacs-mime.texi gnus-faq.texi gnus.texi message.texi pgg.texi sieve.texi" ( echo "Setting up 'man'..." >&2 cd man echo "Removing old *.texi files..." >&2 for i in $manuals; do $rm $i $cp $Oort_base/texi/$i $i done ) ( echo "Setting up 'lisp/gnus'..." >&2 cd lisp/gnus echo "Removing old *.el and *.?pm files..." >&2 $rm *.el *.elc *.?pm echo "New pixmaps..." >&2 $cp $Oort_base/etc/{smilies,gnus}/*.?pm . echo "New lisp files..." >&2 $cp $Oort_base/lisp/*.el . ) ( cd lisp diff_files="net/tls.el gnus/tls.el net/netrc.el gnus/netrc.el calendar/time-date.el gnus/time-date.el" ( set -- $diff_files while [ $# -ge 2 ]; do diff -u $1 $2 shift 2 done > $old_pwd/Gnus-5-11.patch ) ( set -- $diff_files while [ $# -ge 2 ]; do diff -wu $1 $2 shift 2 done > $old_pwd/Gnus-5-11.no-ws.patch ) # Make sure that we don't have any load-path shadows: echo "removing some files.." >&2 # Not needed for GNU Emacs (XEmacs compatibility library) $rm gnus/gnus-xmas.el{,c} # Gnus can use the file from calendar/ instead: $rm gnus/parse-time.el{,c} # Gnus can use the file from net/ instead: $rm gnus/netrc.el{,c} # The following should probably be discussed on emacs-devel: # We should probably move gnus/tls.el to net/ $rm net/tls.el{,c} # The version from calendar/ lacks some function $rm calendar/time-date.el{,c} ) exit --8<---------------cut here---------------end--------------->8---