Re: Gnus 5.11 in Emacs CVS

[Reiner Steib <4.uce.03.r.s@nurfuerspam.de>]

On Wed, Jan 14 2004, Jesper Harder wrote:

> Reiner Steib <4.uce.03.r.s@nurfuerspam.de> writes:
[...]
>> # Not needed for GNU Emacs (XEmacs compatibility library)
>>   $rm gnus/gnus-xmas.el{,c}
>
> Also messagexmas.el, nnheaderxm.el, dgnushack.el gnus-load.el and
> lpath.el.

Yes.

>> # Gnus can use the file from net/ instead:
>>   $rm gnus/netrc.el{,c}
>
> I think netrc.el is primarily maintained in Gnus, so the Gnus version
> should be used.

I took the version from net/ because the changes [1] there seem to be
reasonable.  If there has been a decision to move the file from gnus/
to net/ in the past, it's probably not worth to discuss this again,
unless there are new facts to consider, IMHO.

[ Some related discussions:

- "using qp.el, rfc2047.el in mailutils, rmail"
  <URL:http://thread.gmane.org/gmane.emacs.pretest.bugs/1459>
  <news:E1AZtzf-0007c8-J6@fencepost.gnu.org>

- "Merging quoted-printable functions"
  <URL:http://article.gmane.org/gmane.emacs.devel/18882>
  <news:E1AaMjp-0004fu-VM@fencepost.gnu.org> ]

>> # The version from calendar/ lacks `time-to-number-of-days'
>>   $rm calendar/time-date.el{,c}
>
> Ditto.

Yes.

> We should remove the @iflatex stuff from gnus.texi
>
>     sed -e '/@iflatex/,/@end iflatex/d' $< >
>
> otherwise you can't use the normal procedure to tex it.

"make dvi" gave me a nice "gnus.dvi".  Ah, because of this:

,----
| gnus.dvi: gnus.texi
|         sed -e '/@iflatex/,/@end iflatex/d' ${srcdir}/gnus.texi > gnustmp.texi
|         $(ENVADD) $(TEXI2DVI) gnustmp.texi
|         cp gnustmp.dvi $*.dvi
|         rm gnustmp.*
`----

But we have to add "sieve" and "pgg" to dvi and info targets (as we
have for "message").  See [2].

> Other stuff to consider:
>
> * The refcard.  emacs/etc already has refcards for dired, viper
>   etc. so we might as well include it.

Sure.

> * The ChangeLogs.

Yes, but I don't know what should happen to the entries from
"5.9"-inclusion until today in lisp/gnus/ChangeLog.

> * Maybe some other files from Gnus should go to net/, e.g. dig.el,
>   dns.el ... -- I don't know.

This could be discussed (and done) later, I guess.

Bye, Reiner.

,----[1]
| --- emacs/lisp/net/netrc.el     2003-09-01 17:45:33.000000000 +0200
| +++ gnus-5.10.6/lisp/netrc.el   2002-04-23 19:09:46.000000000 +0200
| @@ -4,7 +4,6 @@
|  
|  ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
| +;; Modularizer: Ted Zlatanov <tzz@lifelogs.com>
|  ;; Keywords: news
| -;;  Modularized by Ted Zlatanov <tzz@lifelogs.com>
| -;;  when it was part of Gnus.
|  
|  ;; This file is part of GNU Emacs.
| @@ -36,11 +35,12 @@
|  ;;;
|  
| +(eval-and-compile
|  (defalias 'netrc-point-at-eol
|    (if (fboundp 'point-at-eol)
|        'point-at-eol
| -    'line-end-position))
| +      'line-end-position)))
|  
|  (defun netrc-parse (file)
| -  "Parse FILE and return a list of all entries in the file."
| +  "Parse FILE and return an list of all entries in the file."
|    (when (file-exists-p file)
|      (with-temp-buffer
| @@ -126,4 +126,3 @@
|  (provide 'netrc)
|  
| -;;; arch-tag: af9929cc-2d12-482f-936e-eb4366f9fa55
|  ;;; netrc.el ends here
`----

[2] Changes to man/Makefile.in:
--8<---------------cut here---------------start------------->8---
--- Makefile.in.~1.52.~	Wed Oct 22 10:30:13 2003
+++ Makefile.in	Wed Jan 14 15:14:57 2004
@@ -34,18 +34,21 @@
 # The makeinfo program is part of the Texinfo distribution.
 MAKEINFO = makeinfo
 INFO_TARGETS = ../info/emacs ../info/ccmode ../info/cl \
-	        ../info/dired-x ../info/ediff ../info/forms ../info/gnus \
-		../info/info ../info/message ../info/mh-e ../info/reftex \
+	        ../info/dired-x ../info/ediff ../info/forms ../info/info \
+                ../info/gnus ../info/message ../info/sieve ../info/pgg \
+                ../info/emacs-mime ../info/mh-e ../info/reftex \
 		../info/sc ../info/vip ../info/viper ../info/widget \
 		../info/efaq ../info/ada-mode ../info/autotype ../info/calc \
 		../info/idlwave ../info/eudc ../info/ebrowse ../info/pcl-cvs \
-		../info/woman ../info/emacs-mime ../info/eshell \
+		../info/woman ../info/eshell \
 		../info/speedbar ../info/tramp ../info/ses ../info/smtpmail
 DVI_TARGETS = 	emacs.dvi calc.dvi cc-mode.dvi cl.dvi dired-x.dvi \
-		 ediff.dvi forms.dvi gnus.dvi message.dvi mh-e.dvi \
+		 ediff.dvi forms.dvi \
+                 gnus.dvi message.dvi sieve.dvi pgg.dvi emacs-mime.dvi \
+                 mh-e.dvi \
 		 reftex.dvi sc.dvi vip.dvi viper.dvi widget.dvi faq.dvi \
 		 ada-mode.dvi autotype.dvi idlwave.dvi eudc.dvi ebrowse.dvi \
-		 pcl-cvs.dvi woman.dvi emacs-mime.dvi eshell.dvi \
+		 pcl-cvs.dvi woman.dvi eshell.dvi \
 		 speedbar.dvi tramp.dvi ses.dvi smtpmail.dvi
 INFOSOURCES = info.texi
 
@@ -185,11 +188,18 @@
 	$(ENVADD) $(TEXI2DVI) gnustmp.texi
 	cp gnustmp.dvi $*.dvi
 	rm gnustmp.*
-
 ../info/message: message.texi
 	cd $(srcdir); $(MAKEINFO) message.texi
 message.dvi: message.texi
 	$(ENVADD) $(TEXI2DVI) ${srcdir}/message.texi
+../info/sieve: sieve.texi
+	cd $(srcdir); $(MAKEINFO) sieve.texi
+sieve.dvi: sieve.texi
+	$(ENVADD) $(TEXI2DVI) ${srcdir}/sieve.texi
+../info/pgg: pgg.texi
+	cd $(srcdir); $(MAKEINFO) pgg.texi
+pgg.dvi: pgg.texi
+	$(ENVADD) $(TEXI2DVI) ${srcdir}/pgg.texi
 
 ../info/mh-e: mh-e.texi
 	cd $(srcdir); $(MAKEINFO) mh-e.texi
--8<---------------cut here---------------end--------------->8---
-- 
       ,,,
      (o o)
---ooO-(_)-Ooo--- PGP key available via WWW   http://rsteib.home.pages.de/