Merge from emacs-23; up to 2012-01-19T07:15:48Z!rgm@gnu.org.

[bpt/emacs.git] / lisp / mail / reporter.el

diff --git a/lisp/mail/reporter.el b/lisp/mail/reporter.el
index 46d3746..b4ee19b 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-2012 Free Software Foundation, Inc.
 
 ;; Author:          1993-1998 Barry A. Warsaw
 ;; Maintainer:      FSF
@@ -174,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)
@@ -201,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) " ")))
@@ -247,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")
@@ -336,12 +332,11 @@ 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)
@@ -410,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