Sync up with Gnus 5.6.44.

diff --git a/ChangeLog b/ChangeLog
index 80d0d11..a976283 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+1998-09-26  Katsumi Yamaoka   <yamaoka@jpl.org>
+
+       * lisp/gnus.el (gnus-version-number): Update to 6.8.19.
+
+       * Sync up with Gnus 5.6.44.
+
 1998-09-16  Katsumi Yamaoka   <yamaoka@jpl.org>
 
        * Makefile.in: Add entry `info-ja'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d06cf06..881cffe 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,84 @@
+Thu Sep 24 19:29:43 1998  Lars Magne Ingebrigtsen  <larsi@menja.ifi.uio.no>
+
+       * gnus.el: Gnus v5.6.44 is released.
+
+1998-09-23 20:34:27  Markus Rost  <markus.rost@mathematik.uni-regensburg.de>
+
+       * gnus.el: Extend autoloads.
+
+1998-09-15 18:57:48  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * gnus-draft.el (gnus-draft-send): Bind required headers to nil. 
+       (gnus-draft-send): No.
+
+1998-09-14 15:16:42  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * message.el (message-fix-before-sending): Comment out invisible
+       text things.
+
+1998-09-14 14:30:09  Tatsuya Ichikawa  <ichikawa@hv.epson.co.jp>
+
+       * gnus-agent.el (gnus-agent-file-coding-system): Renamed.
+
+1998-09-13  Mike McEwan  <mike@lotusland.demon.co.uk>
+
+       * gnus-agent.el (gnus-agent-expire): Stop expiry barfing on killed 
+       groups.
+
+1998-09-13 07:02:04  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * gnus-agent.el (gnus-agent-save-group-info): Create proper active
+       lines. 
+
+1998-09-10 02:40:28  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * gnus-draft.el (gnus-draft-edit-message): Save the buffer. 
+
+Sun Sep  6 20:09:36 1998  Lars Magne Ingebrigtsen  <larsi@menja.ifi.uio.no>
+
+       * gnus.el: Gnus v5.6.43 is released.
+
+1998-09-06 19:41:54  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * gnus-sum.el (gnus-remove-thread): Unhide threads before
+       removing. 
+       (gnus-data-compute-positions): Ditto.
+
+1998-08-31 11:40:13  Shuhei KOBAYASHI  <shuhei-k@jaist.ac.jp>
+
+       * nnmail.el (nnmail-date-to-time): Parse time locally if no
+       timezone. 
+
+1998-08-31 11:21:53  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * gnus-srvr.el (gnus-browse-foreign-server): Protect against
+       out-of-range articles.
+
+       * gnus-msg.el (gnus-summary-reply): Don't inhibit posting styles.
+
+1998-08-30 22:33:33  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * gnus-score.el (gnus-summary-increase-score): Temporary third
+       majuscle. 
+
+1998-08-30 22:32:31  Dan Christensen  <jdc@playmate.mat.jhu.edu>
+
+       * gnus-score.el (gnus-summary-increase-score): Score thread on
+       Message-ID. 
+
+1998-08-29 02:46:00  Simon Josefsson  <jas@pdc.kth.se>
+
+       * gnus-sum.el (gnus-summary-mark-article-as-read): 
+       (gnus-summary-mark-article-as-unread): 
+       (gnus-summary-mark-article): Call gnus-request-update-mark.
+
+1998-08-29  Mike McEwan  <mike@lotusland.demon.co.uk>
+
+       * gnus-agent.el (gnus-agent-fetch-headers): Cater for when there's 
+       no .agentview, all articles have been expired, or everything bar a 
+       few downloaded arts have been expired.
+       (gnus-agent-expire): Mark *all* expired articles as read.
+
 Sat Aug 29 19:17:19 1998  Lars Magne Ingebrigtsen  <larsi@menja.ifi.uio.no>
 
        * gnus.el: Gnus v5.6.42 is released.

diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el
index 7fc3619..d9c1be9 100644 (file)
--- a/lisp/gnus-agent.el
+++ b/lisp/gnus-agent.el
@@ -92,7 +92,7 @@ If nil, only read articles will be expired."
 (defvar gnus-agent-spam-hashtb nil)
 (defvar gnus-agent-file-name nil)
 (defvar gnus-agent-send-mail-function nil)
-(defvar gnus-agent-article-file-coding-system 'no-conversion)
+(defvar gnus-agent-file-coding-system 'no-conversion)
 
 ;; Dynamic variables
 (defvar gnus-headers)
@@ -517,7 +517,7 @@ the actual number of articles toggled is returned."
     (let* ((gnus-command-method method)
           (file (gnus-agent-lib-file "active")))
       (gnus-make-directory (file-name-directory file))
-      (let ((coding-system-for-write gnus-agent-article-file-coding-system))
+      (let ((coding-system-for-write gnus-agent-file-coding-system))
        (write-region (point-min) (point-max) file nil 'silent))
       (when (file-exists-p (gnus-agent-lib-file "groups"))
        (delete-file (gnus-agent-lib-file "groups"))))))
@@ -526,9 +526,10 @@ the actual number of articles toggled is returned."
   (let* ((gnus-command-method method)
         (file (gnus-agent-lib-file "groups")))
     (gnus-make-directory (file-name-directory file))
-    (write-region (point-min) (point-max) file nil 'silent))
+    (let ((coding-system-for-write gnus-agent-file-coding-system))
+      (write-region (point-min) (point-max) file nil 'silent))
     (when (file-exists-p (gnus-agent-lib-file "active"))
-      (delete-file (gnus-agent-lib-file "active"))))
+      (delete-file (gnus-agent-lib-file "active")))))
 
 (defun gnus-agent-save-group-info (method group active)
   (when (gnus-agent-method-p method)
@@ -547,7 +548,7 @@ the actual number of articles toggled is returned."
                     (concat "^" (regexp-quote group) " ") nil t)
                (gnus-delete-line))
              (insert group " " (number-to-string (cdr active)) " "
-                     (number-to-string (car active)) "\n"))
+                     (number-to-string (car active)) " y\n"))
          (when (re-search-forward (concat (regexp-quote group) " ") nil t)
            (gnus-delete-line))
          (insert-buffer-substring nntp-server-buffer))))))
@@ -597,8 +598,9 @@ the actual number of articles toggled is returned."
   (save-excursion
     (set-buffer gnus-agent-current-history)
     (gnus-make-directory (file-name-directory gnus-agent-file-name))
-    (write-region (1+ (point-min)) (point-max)
-                 gnus-agent-file-name nil 'silent)))
+    (let ((coding-system-for-write gnus-agent-file-coding-system))
+      (write-region (1+ (point-min)) (point-max)
+                   gnus-agent-file-name nil 'silent))))
 
 (defun gnus-agent-close-history ()
   (when (gnus-buffer-live-p gnus-agent-current-history)
@@ -696,7 +698,7 @@ the actual number of articles toggled is returned."
                (setq id "No-Message-ID-in-article")
              (setq id (buffer-substring (match-beginning 1) (match-end 1))))
            (let ((coding-system-for-write
-                  gnus-agent-article-file-coding-system))
+                  gnus-agent-file-coding-system))
              (write-region (point-min) (point-max)
                            (concat dir (number-to-string (caar pos)))
                            nil 'silent))
@@ -739,10 +741,12 @@ the actual number of articles toggled is returned."
   (save-excursion
     (while gnus-agent-buffer-alist
       (set-buffer (cdar gnus-agent-buffer-alist))
-      (write-region (point-min) (point-max)
-                   (gnus-agent-article-name ".overview"
-                                            (caar gnus-agent-buffer-alist))
-                    nil 'silent)
+      (let ((coding-system-for-write
+            gnus-agent-file-coding-system))
+       (write-region (point-min) (point-max)
+                     (gnus-agent-article-name ".overview"
+                                              (caar gnus-agent-buffer-alist))
+                     nil 'silent))
       (pop gnus-agent-buffer-alist))
     (while gnus-agent-group-alist
       (nnheader-temp-write (caar gnus-agent-group-alist)
@@ -773,7 +777,9 @@ the actual number of articles toggled is returned."
            (gnus-agent-braid-nov group articles file))
          (gnus-make-directory (nnheader-translate-file-chars
                                (file-name-directory file)))
-         (write-region (point-min) (point-max) file nil 'silent)
+         (let ((coding-system-for-write
+                gnus-agent-file-coding-system))
+           (write-region (point-min) (point-max) file nil 'silent))
          (gnus-agent-save-alist group articles nil)
          (gnus-agent-enter-history
           "last-header-fetched-for-session"
@@ -1343,7 +1349,9 @@ The following commands are available:
                 ;; Schedule the history line for nuking.
                 (push (cdr elem) histories)))
             (gnus-make-directory (file-name-directory nov-file))
-            (write-region (point-min) (point-max) nov-file nil 'silent)
+            (let ((coding-system-for-write
+                   gnus-agent-file-coding-system))
+              (write-region (point-min) (point-max) nov-file nil 'silent))
             ;; Delete the unwanted entries in the alist.
             (setq gnus-agent-article-alist
                   (sort gnus-agent-article-alist 'car-less-than-car))
@@ -1367,7 +1375,7 @@ The following commands are available:
               (setq gnus-agent-article-alist (cdr first))
               ;;; Mark all articles up to the first article
               ;;; in `gnus-article-alist' as read.
-              (when (caar gnus-agent-article-alist)
+              (when (and info (caar gnus-agent-article-alist))
                 (setcar (nthcdr 2 info)
                         (gnus-range-add
                          (nth 2 info)

diff --git a/lisp/gnus-draft.el b/lisp/gnus-draft.el
index fce8744..7a3ca8a 100644 (file)
--- a/lisp/gnus-draft.el
+++ b/lisp/gnus-draft.el
@@ -96,6 +96,8 @@
   (let ((article (gnus-summary-article-number)))
     (gnus-summary-mark-as-read article gnus-canceled-mark)
     (gnus-draft-setup article gnus-newsgroup-name)
+    (set-buffer-modified-p t)
+    (save-buffer)
     (push
      `((lambda ()
         (when (gnus-buffer-exists-p ,gnus-summary-buffer)
@@ -132,13 +134,16 @@
        (message-remove-header gnus-agent-meta-information-header)))
     ;; Then we send it.  If we have no meta-information, we just send
     ;; it and let Message figure out how.
-    (if type
-       (let ((message-this-is-news (eq type 'news))
-             (message-this-is-mail (eq type 'mail))
-             (gnus-post-method method)
-             (message-post-method method))
-         (message-send-and-exit))
-      (message-send-and-exit))))
+    (when (if type
+             (let ((message-this-is-news (eq type 'news))
+                   (message-this-is-mail (eq type 'mail))
+                   (gnus-post-method method)
+                   (message-post-method method))
+               (message-send-and-exit))
+           (message-send-and-exit))
+      (let ((gnus-verbose-backends nil))
+       (gnus-request-expire-articles
+        (list article) (or group "nndraft:queue") t)))))
 
 (defun gnus-draft-send-all-messages ()
   "Send all the sendable drafts."

diff --git a/lisp/gnus-logic.el b/lisp/gnus-logic.el
index f2913f1..c276a0b 100644 (file)
--- a/lisp/gnus-logic.el
+++ b/lisp/gnus-logic.el
@@ -164,9 +164,9 @@
     (funcall type match (or (aref gnus-advanced-headers index) 0))))
 
 (defun gnus-advanced-date (index match type)
-  (let ((date (encode-time (parse-time-string
-                           (aref gnus-advanced-headers index))))
-       (match (encode-time (parse-time-string match))))
+  (let ((date (apply 'encode-time (parse-time-string
+                                  (aref gnus-advanced-headers index))))
+       (match (apply 'encode-time (parse-time-string match))))
     (cond
      ((eq type 'at)
       (equal date match))

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index a221ba7..cff4f0e 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -7114,7 +7114,7 @@ re-spool using this method."
 (defcustom gnus-summary-respool-default-method nil
   "Default method for respooling an article.
 If nil, use to the current newsgroup method."
-  :type `(choice (gnus-select-method :value (nnml ""))
+  :type '(choice (gnus-select-method :value (nnml ""))
                 (const nil))
   :group 'gnus-summary-mail)
 

diff --git a/lisp/gnus-util.el b/lisp/gnus-util.el
index a25b497..5359dda 100644 (file)
--- a/lisp/gnus-util.el
+++ b/lisp/gnus-util.el
@@ -762,9 +762,12 @@ with potentially long computations."
            (when msg
              (goto-char (point-min))
              (widen)
-             (search-backward "\^_")
-             (narrow-to-region (point) (point-max))
-             (goto-char (1+ (point-min)))
+             (search-backward "\n\^_")
+             (narrow-to-region (point) (point-max))
+             (rmail-count-new-messages t)
+             (when (rmail-summary-exists)
+               (rmail-select-summary
+                (rmail-update-summary)))
              (rmail-count-new-messages t)
              (rmail-show-message msg))
            (save-buffer)))))

diff --git a/lisp/gnus.el b/lisp/gnus.el
index 3c77516..871b70f 100644 (file)
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -250,11 +250,11 @@ is restarted, and sometimes reloaded."
   :link '(custom-manual "(gnus)Exiting Gnus")
   :group 'gnus)
 
-(defconst gnus-version-number "6.8.18"
+(defconst gnus-version-number "6.8.19"
   "Version number for this version of gnus.")
 
 (defconst gnus-version
-  (format "Semi-gnus %s (based on Gnus 5.6.43; for SEMI 1.8, FLIM 1.8/1.9)"
+  (format "Semi-gnus %s (based on Gnus 5.6.44; for SEMI 1.8, FLIM 1.8/1.9)"
           gnus-version-number)
   "Version string for this version of gnus.")
 
@@ -1651,7 +1651,7 @@ gnus-newsrc-hashtb should be kept so that both hold the same information.")
       gnus-uu-decode-uu-and-save-view gnus-uu-decode-unshar-view
       gnus-uu-decode-unshar-and-save-view gnus-uu-decode-save-view
       gnus-uu-decode-binhex-view gnus-uu-unmark-thread
-      gnus-uu-mark-over)
+      gnus-uu-mark-over gnus-uu-post-news gnus-uu-post-news)
      ("gnus-uu" gnus-uu-delete-work-dir gnus-quote-arg-for-sh-or-csh
       gnus-uu-unmark-thread)
      ("gnus-msg" (gnus-summary-send-map keymap)
@@ -1664,7 +1664,10 @@ gnus-newsrc-hashtb should be kept so that both hold the same information.")
       gnus-summary-mail-forward gnus-summary-mail-other-window
       gnus-summary-resend-message gnus-summary-resend-bounced-mail
       gnus-summary-wide-reply gnus-summary-followup-to-mail
-      gnus-summary-followup-to-mail-with-original gnus-bug)
+      gnus-summary-followup-to-mail-with-original gnus-bug
+      gnus-summary-wide-reply-with-original
+      gnus-summary-post-forward gnus-summary-wide-reply-with-original
+      gnus-summary-post-forward)
      ("gnus-picon" :interactive t gnus-article-display-picons
       gnus-group-display-picons gnus-picons-article-display-x-face
       gnus-picons-display-x-face)

diff --git a/lisp/message.el b/lisp/message.el
index 7ea4415..cd6ca1d 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -1913,7 +1913,8 @@ The text will also be indented the normal way."
        (when (eq buf (current-buffer))
          (message-bury buf)))
       (message-do-actions actions)
-      (message-delete-frame frame org-frame))))
+      (message-delete-frame frame org-frame)
+      t)))
 
 (defun message-dont-send ()
   "Don't send the message you have been editing."
@@ -2037,11 +2038,12 @@ the user from the mailer."
   (goto-char (point-max))
   (unless (bolp)
     (insert "\n"))
-  ;; Delete all invisible text.
-  (when (text-property-any (point-min) (point-max) 'invisible t)
-    (put-text-property (point-min) (point-max) 'invisible nil)
-    (unless (yes-or-no-p "Invisible text found and made visible; continue posting?")
-      (error "Invisible text found and made visible"))))
+  ;; Make all invisible text visible.
+  ;;(when (text-property-any (point-min) (point-max) 'invisible t)
+  ;;  (put-text-property (point-min) (point-max) 'invisible nil)
+  ;;  (unless (yes-or-no-p "Invisible text found and made visible; continue posting?")
+  ;;    (error "Invisible text found and made visible")))
+  )
 
 (defun message-add-action (action &rest types)
   "Add ACTION to be performed when doing an exit of type TYPES."

diff --git a/lisp/nndraft.el b/lisp/nndraft.el
index f7182a5..c6f23c4 100644 (file)
--- a/lisp/nndraft.el
+++ b/lisp/nndraft.el
@@ -130,8 +130,6 @@
   (when (nndraft-request-article article group server (current-buffer))
     (message-remove-header "xref")
     (message-remove-header "lines")
-    (let ((gnus-verbose-backends nil))
-      (nndraft-request-expire-articles (list article) group server t))
     t))
 
 (deffoo nndraft-request-update-info (group info &optional server)

diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index 9dacb61..8d32fd1 100644 (file)
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -1,7 +1,7 @@
 \input texinfo                  @c -*-texinfo-*-
 
 @setfilename gnus-ja
-@settitle Semi-gnus 6.8.17 Manual
+@settitle Semi-gnus 6.8.19 Manual
 @synindex fn cp
 @synindex vr cp
 @synindex pg cp
@@ -345,7 +345,7 @@ into another language, under the above conditions for modified versions.
 @tex
 
 @titlepage
-@title Semi-gnus 6.8.17 Manual
+@title Semi-gnus 6.8.19 Manual
 
 @author by Lars Magne Ingebrigtsen
 @author by members of Semi-gnus mailing-list
@@ -399,7 +399,7 @@ Semi-gnus \e$B$O!"Bg$-$J3($,F~$C$F$$$?$j$5$^$6$^$J7A<0$rMQ$$$?$j$7$F$$$k$A$g$C\e(B
 \e$B$J8@8l7w$r:9JL$7$^$;$s!#$"$"!"%/%j%s%4%s$NJ}$O\e(B Unicode Next Generation\e$B$r\e(B
 \e$B$*BT$A$/$@$5$$!#\e(B
 
-\e$B$3$N@bL@=q$O\e(B Semi-gnus 6.8.17 \e$B$KBP1~$7$^$9!#\e(B
+\e$B$3$N@bL@=q$O\e(B Semi-gnus 6.8.19 \e$B$KBP1~$7$^$9!#\e(B
 
 @end ifinfo
 
@@ -18125,11 +18125,12 @@ Gnus \e$B$OH"$+$i=P$7$F$9$0$K\e(B @emph{\e$BHs>o$K\e(B} \e$B$h$/F0:n$7$^$9\e(B---\e$B2?
 \e$BF0$9$kI,MW$,$"$j$^$9!#\e(B
 
 @item
-@kbd{M-x gnus-version} \e$B$r;n$7$F2<$5$$!#$b$7!"\e(B@samp{Semi-gnus 6.8.0
-(based on Gnus 5.6.22; for SEMI 1.8/FLIM 1.8); nntp 5.0;} \e$B$N$h$&$J$b$N$,\e(B
-\e$B=P$F$-$?$J$i!"@5$7$$%U%!%$%k$,FI$_9~$^$l$F$$$^$9!#$b$7!"\e(B@samp{NNTP 3.x} 
-\e$B$d\e(B @samp{nntp flee} \e$B$N$h$&$J$b$N$,=P$F$-$?$H$-$O!"$=$3$K$"$k$$$/$D$+$N8E\e(B
-\e$B$$\e(B @file{.el} \e$B%U%!%$%k$,FI$_9~$^$l$F$$$^$9!#$=$l$i$r>C$7$F2<$5$$!#\e(B
+@kbd{M-x gnus-version} \e$B$r;n$7$F2<$5$$!#$b$7!"\e(B
+@samp{Semi-gnus 6.8.19 (based on Gnus 5.6.44; for SEMI 1.8, FLIM 1.9/1.9)}
+\e$B$N$h$&$J$b$N$,=P$F$-$?$J$i!"@5$7$$%U%!%$%k$,FI$_9~$^$l$F$$$^$9!#\e(B
+\e$B$b$7!"\e(B@samp{NNTP 3.x} \e$B$d\e(B @samp{nntp flee} \e$B$N$h$&$J$b$N$,=P$F$-$?$H$-$O!"\e(B
+\e$B$=$3$K$"$k$$$/$D$+$N8E$$\e(B @file{.el} \e$B%U%!%$%k$,FI$_9~$^$l$F$$$^$9!#$=$l$i\e(B
+\e$B$r>C$7$F2<$5$$!#\e(B
 
 @item
 FAQ \e$B$H\e(B how-to \e$B$rFI$`$?$a$K%X%k%W%0%k!<%W\e(B (\e$B%0%k!<%W%P%C%U%!$G\e(B @kbd{G h}) 
@@ -19699,4 +19700,3 @@ lisp \e$B8l$G$9\e(B) \e$B$5$l$^$9!#$b$7JQ?t$r$9$0$KJQ99$7$?$$$N$G$"$l$P!"JD$83g8L$N
 @end iftex
 
 @c End:
-

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 6a2bd37..528ef61 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -1,7 +1,7 @@
 \input texinfo                  @c -*-texinfo-*-
 
 @setfilename gnus
-@settitle Semi-gnus 6.8.17 Manual
+@settitle Semi-gnus 6.8.19 Manual
 @synindex fn cp
 @synindex vr cp
 @synindex pg cp
@@ -318,7 +318,7 @@ into another language, under the above conditions for modified versions.
 @tex
 
 @titlepage
-@title Semi-gnus 6.8.17 Manual
+@title Semi-gnus 6.8.19 Manual
 
 @author by Lars Magne Ingebrigtsen
 @page
@@ -361,7 +361,7 @@ internationalization/localization and multiscript features based on MULE
 API.  So Semi-gnus does not discriminate various language communities.
 Oh, if you are a Klingon, please wait Unicode Next Generation.
 
-This manual corresponds to Semi-gnus 6.8.17.
+This manual corresponds to Semi-gnus 6.8.19.
 
 @end ifinfo
 

diff --git a/texi/message.texi b/texi/message.texi
index 5399b2f..cc37033 100644 (file)
--- a/texi/message.texi
+++ b/texi/message.texi
@@ -1,7 +1,7 @@
 \input texinfo                  @c -*-texinfo-*-
 
 @setfilename message
-@settitle Message 5.6.42 Manual
+@settitle Message 5.6.44 Manual
 @synindex fn cp
 @synindex vr cp
 @synindex pg cp
@@ -42,7 +42,7 @@ into another language, under the above conditions for modified versions.
 @tex
 
 @titlepage
-@title Message 5.6.42 Manual
+@title Message 5.6.44 Manual
 
 @author by Lars Magne Ingebrigtsen
 @page
@@ -83,7 +83,7 @@ Message mode buffers.
 * Key Index::         List of Message mode keys.
 @end menu
 
-This manual corresponds to Message 5.6.42.  Message is distributed with
+This manual corresponds to Message 5.6.44.  Message is distributed with
 the Gnus distribution bearing the same version number as this manual
 has. 
 
@@ -434,9 +434,8 @@ Move to the signature of the message (@code{message-goto-signature}).
 @item C-c C-y
 @kindex C-c C-y 
 @findex message-yank-original
-Yank the message in the buffer @code{gnus-article-copy} into the message
-buffer. Normally @code{gnus-article-copy} is what you are replying to
-(@code{message-yank-original}).
+Yank the message that's being replied to into the message buffer
+(@code{message-yank-original}). 
 
 @item C-c C-q
 @kindex C-c C-q 
@@ -1160,18 +1159,6 @@ this is a function, call that function with three parameters: The type,
 the to address and the group name.  (Any of these may be @code{nil}.)
 The function should return the new buffer name.
 
-@item message-use-multi-frames
-@vindex message-use-multi-frames
-If non-@code{nil}, generate new frames. The default is @code{nil}.
-
-@item message-delete-frame-on-exit
-@vindex message-delete-frame-on-exit
-The @code{message-delete-frame-on-exit} variable says whether to delete
-the frame after sending the message or killing the message buffer. If it
-is @code{nil} (which is the default), don't delete the frame. If it is
-@code{ask}, ask wheter to delete the frame. If it is @code{t}, always
-delete the frame.
-
 @item message-max-buffers
 @vindex message-max-buffers
 This variable says how many old message buffers to keep.  If there are