X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/acaf905b1130aae80fa59d2c861ffd4c8eb75486..963541a6540c40559645c312cea7f35c3c649556:/lisp/mail/reporter.el

diff --git a/lisp/mail/reporter.el b/lisp/mail/reporter.el
index b4ee19b518..5f4b3ad0cd 100644
--- a/lisp/mail/reporter.el
+++ b/lisp/mail/reporter.el
@@ -1,9 +1,9 @@
 ;;; reporter.el --- customizable bug reporting of lisp programs
 
-;; Copyright (C) 1993-1998, 2001-2012 Free Software Foundation, Inc.
+;; Copyright (C) 1993-1998, 2001-2016 Free Software Foundation, Inc.
 
 ;; Author:          1993-1998 Barry A. Warsaw
-;; Maintainer:      FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Created:         19-Apr-1993
 ;; Keywords: maint mail tools
 
@@ -200,9 +200,10 @@ MAILBUF is the mail buffer being composed."
 	(insert "\n"))
     (void-variable
      (with-current-buffer mailbuf
-       (mail-position-on-field "X-Reporter-Void-Vars-Found")
-       (end-of-line)
-       (insert (symbol-name varsym) " ")))
+       (save-excursion
+	 (mail-position-on-field "X-Reporter-Void-Vars-Found")
+	 (end-of-line)
+	 (insert (symbol-name varsym) " "))))
     (error
      (error ""))))
 
@@ -341,10 +342,10 @@ mail-sending package is used for editing and sending the message."
     (mail-position-on-field "to")
     (insert address)
     ;; insert problem summary if available
-    (if (and reporter-prompt-for-summary-p problem pkgname)
-	(progn
-	  (mail-position-on-field "subject")
-	  (insert pkgname "; " problem)))
+    (when (and reporter-prompt-for-summary-p problem)
+      (mail-position-on-field "subject")
+      (if pkgname (insert pkgname "; "))
+      (insert problem))
     ;; move point to the body of the message
     (mail-text)
     (forward-line 1)