Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6e252f4..b2cc8e0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-31  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+
+       * gnus-delay.el (gnus-delay-initialize): Use standard define-key
+       syntax.
+
 2001-07-30 15:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
        Originally from Andreas Fuchs <asf@void.at>
 

diff --git a/lisp/gnus-delay.el b/lisp/gnus-delay.el
index 5d6eb44..86ea4b4 100644 (file)
--- a/lisp/gnus-delay.el
+++ b/lisp/gnus-delay.el
@@ -132,7 +132,7 @@ Key binding is skipped if optional arg NO-KEYMAP is non-nil.
 Checking delayed messages is skipped if optional arg NO-CHECK is non-nil."
   (unless no-keymap
     (require 'message)
-    (define-key message-mode-map "\C-c\C-j" 'gnus-delay-article))
+    (define-key message-mode-map "\C-c\n" 'gnus-delay-article))
   (unless no-check
     (add-hook 'gnus-get-new-news-hook 'gnus-delay-send-drafts)))
 

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 2de0172..269b091 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,11 @@
+2001-07-31  Simon Josefsson  <jas@extundo.com>
+
+       * bembo.sty: New file.
+
+       * texi2latex.el (latexi-translate-file): Support @noindent.
+
+       * gnus-faq.texi (Reading News FAQ): Fix (@email -> @samp).
+
 2001-07-28 09:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
        From Janne Rinta-Manty <rintaman@cs.helsinki.fi>
 

diff --git a/texi/bembo.sty b/texi/bembo.sty
new file mode 100644 (file)
index 0000000..e676c3e
--- /dev/null
+++ b/texi/bembo.sty
@@ -0,0 +1,32 @@
+% -----------------------------------------------------------------
+% Filename: bembo.sty ( Aldine 401 )
+% Created by: tex bbb
+% Created using fontinst v1.335
+% Created for [4allTeX postscript font setup]
+% Created on [1996/04/26]
+% Use phbfonti.sty file (in 4allTeX package)
+% Based on PSNFSS 2.4.1 and 3.x by S. Rahtz
+% Put this file in a TEXINPUT directory.
+% -----------------------------------------------------------------
+% Can be processed by LaTeX209 and LaTeX2e
+\def\fileversion{3q}
+\def\filedate{94/10/22}
+\def\docdate{94/10/22}
+\ifx\ProvidesPackage\undefined
+\immediate\write\sixt@@n{File: bembo.sty NFSS1 fontinst (PhB)}
+\ifx\selectfont\undefined
+\@latexerr{No NFSS1 detected...}\@eha\endinput\fi
+
+\ifx\declare@font\undefined\input{psnfss.sup}\fi
+\def\load@bbb{\postscript@fontdef{Aldine 401 }{bbb}%
+  {bbbr}{bbbri}{bbbb}{bbbbi}{bbbrc}{bbbro}}
+\late@extra@def{bbb}{}{}
+\load@bbb
+\else
+\immediate\write\sixt@@n{File: bembo.sty LaTeX2e fontinst (PhB)}
+\ProvidesPackage{bembo}[\filedate\space\fileversion\space
+ LaTeX2e fontinst (PhB)]\fi
+
+\def\rmdefault{bbb}
+\def\switchfont{}
+\endinput

diff --git a/texi/gnus-faq.texi b/texi/gnus-faq.texi
index 72f829a..611a50c 100644 (file)
--- a/texi/gnus-faq.texi
+++ b/texi/gnus-faq.texi
@@ -499,7 +499,7 @@ in your @file{.gnus} instead.
 @item
 Q3.1  How do I convert my kill files to score files?
 
-@email{ethanb@@ptolemy.astro.washington.edu, Ethan Bradford} write a
+@samp{ethanb@@ptolemy.astro.washington.edu, Ethan Bradford} write a
 kill-to-score translator.  It is available from@*
 @file{http://baugi.ifi.uio.no/~larsi/ding-various/gnus-kill-to-score.el}.
 

diff --git a/texi/texi2latex.el b/texi/texi2latex.el
index acc28e5..9eb2880 100644 (file)
--- a/texi/texi2latex.el
+++ b/texi/texi2latex.el
@@ -208,6 +208,9 @@
               ((equal command "include")
                (latexi-strip-line)
                (insert "\\input{gnus-faq.latexi}\n"))
+              ((equal command "noindent")
+               (latexi-strip-line)
+               (insert "\\noindent\n"))
               ((equal command "printindex")
                (latexi-strip-line)
                ;;(insert 
@@ -215,7 +218,11 @@
                ;;  "\\begin{theindex}\\input{gnus.%s}\\end{theindex}\n" arg))
                )
               (t
-               (error "Unknown command: %s" command))))
+               (error "Unknown command (line %d): %s"
+                      (save-excursion
+                        (widen)
+                        (1+ (count-lines (point-min) (point-at-bol))))
+                      command))))
          ;; These are commands with {}.
          (setq arg (match-string 5))
          (cond 
@@ -242,7 +249,11 @@
            (delete-char 2)
            (insert "duppat{}"))
           (t
-           (error "Unknown command: %s" command))))))
+           (error "Unknown command (line %d): %s"
+                  (save-excursion
+                    (widen)
+                    (1+ (count-lines (point-min) (point-at-bol))))
+                  command))))))
     (latexi-translate-string "$" "\\gnusdollar{}")
     (latexi-translate-string "&" "\\gnusampersand{}")
     (latexi-translate-string "%" "\\gnuspercent{}")