Update copyright year to 2014 by running admin/update-copyright.

[gnu-emacs] / lisp / mail / reporter.el

diff --git a/lisp/mail/reporter.el b/lisp/mail/reporter.el
index 97220fa6005fa2ae4bd746c553f6a99f57104784..35eb582bf77b162392a5eb934ab1052a7523f385 100644 (file)
--- a/lisp/mail/reporter.el
+++ b/lisp/mail/reporter.el
@@ -1,7 +1,6 @@
 ;;; reporter.el --- customizable bug reporting of lisp programs
 
-;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 2001, 2002, 2003,
-;;   2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 1993-1998, 2001-2014 Free Software Foundation, Inc.
 
 ;; Author:          1993-1998 Barry A. Warsaw
 ;; Maintainer:      FSF
@@ -10,10 +9,10 @@
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,9 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -176,8 +173,7 @@ composed.")
 MAILBUF is the mail buffer being composed."
   (reporter-update-status)
   (condition-case nil
-      (let ((val (save-excursion
-                  (set-buffer reporter-eval-buffer)
+      (let ((val (with-current-buffer reporter-eval-buffer
                   (symbol-value varsym)))
            (sym (symbol-name varsym))
            (print-escape-newlines t)
@@ -203,8 +199,7 @@ MAILBUF is the mail buffer being composed."
                (reporter-beautify-list maxwidth compact-p))))
        (insert "\n"))
     (void-variable
-     (save-excursion
-       (set-buffer mailbuf)
+     (with-current-buffer mailbuf
        (mail-position-on-field "X-Reporter-Void-Vars-Found")
        (end-of-line)
        (insert (symbol-name varsym) " ")))
@@ -249,8 +244,7 @@ dumped."
       (condition-case fault
          (let ((mailbuf (current-buffer))
                (elbuf (get-buffer-create " *tmp-reporter-buffer*")))
-           (save-excursion
-             (set-buffer elbuf)
+           (with-current-buffer elbuf
              (emacs-lisp-mode)
              (erase-buffer)
              (insert "(setq\n")
@@ -338,20 +332,19 @@ mail-sending package is used for editing and sending the message."
        hookvar)
     ;; do the work
     (require 'sendmail)
+    ;; Just in case the original buffer is not visible now, bring it
+    ;; back somewhere
+    (display-buffer reporter-eval-buffer)
     ;; If mailbuf did not get made visible before, make it visible now.
-    (let (same-window-buffer-names same-window-regexps)
-      (pop-to-buffer mailbuf)
-      ;; Just in case the original buffer is not visible now, bring it
-      ;; back somewhere
-      (and pop-up-windows (display-buffer reporter-eval-buffer)))
+    (pop-to-buffer mailbuf)
     (goto-char (point-min))
     (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)
@@ -412,5 +405,4 @@ mail-sending package is used for editing and sending the message."
 \f
 (provide 'reporter)
 
-;; arch-tag: 33612ff4-fbbc-4be2-b183-560ce9e0199b
 ;;; reporter.el ends here