XEmacs 21.2-b3

[chise/xemacs-chise.git.1] / lisp / lisp-mnt.el

diff --git a/lisp/lisp-mnt.el b/lisp/lisp-mnt.el
index 0eda679..f03f23e 100644 (file)
--- a/lisp/lisp-mnt.el
+++ b/lisp/lisp-mnt.el
@@ -407,7 +407,7 @@ with tag `Commentary' and ends with tag `Change Log' or `History'."
        (let ((commentary       (lm-commentary-mark))
              (change-log       (lm-history-mark))
              (code             (lm-code-mark))
-             )
+             end)
          (cond
           ((and commentary change-log)
            (buffer-substring commentary change-log))
@@ -415,9 +415,9 @@ with tag `Commentary' and ends with tag `Change Log' or `History'."
            (buffer-substring commentary code))
           (t
            ;; XEmacs change (Infodock headers? -sb)
-           (setq commentary (lm-section-mark "DESCRIPTION" t)
-                 code (lm-section-mark "DESCRIP-END"))
-           (and commentary end (buffer-substring commentary code)))))
+           (setq commentary (lm-section-mark "DESCRIPTION" t))
+           (setq end (lm-section-mark "DESCRIP-END"))
+           (and commentary end (buffer-substring commentary end)))))
       (if file
          (kill-buffer (current-buffer)))
       )))
@@ -560,7 +560,9 @@ Prompts for bug subject.  Leaves you in a mail buffer."
     (mail nil
          (if addr
              (concat (car addr) " <" (cdr addr) ">")
-           bug-gnu-emacs)
+           (or (and (boundp 'report-emacs-bug-beta-address)
+                    report-emacs-bug-beta-address)
+               "<xemacs-beta@xemacs.org>"))
          topic)
     (goto-char (point-max))
     (insert "\nIn "