mail/rmailmm.el (rmail-mime-insert-multipart): For unsupported multipart subtypes...

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

diff --git a/lisp/mail/reporter.el b/lisp/mail/reporter.el
index 596c7ee9627785dd77aa840f90dad6585148280a..877cc5aa399bb120807357970d37a907095fe713 100644 (file)
--- a/lisp/mail/reporter.el
+++ b/lisp/mail/reporter.el
@@ -1,7 +1,7 @@
 ;;; reporter.el --- customizable bug reporting of lisp programs
 
 ;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 2001, 2002, 2003,
-;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
 ;; Author:          1993-1998 Barry A. Warsaw
 ;; Maintainer:      FSF
@@ -10,10 +10,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 +21,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:
 
@@ -118,7 +116,7 @@ composed.")
   "Periodically output a status message."
   (if (zerop (% reporter-status-count 10))
       (progn
-       (message reporter-status-message)
+       (message "%s" reporter-status-message)
        (setq reporter-status-message (concat reporter-status-message "."))))
   (setq reporter-status-count (1+ reporter-status-count)))
 
@@ -168,13 +166,15 @@ composed.")
     (goto-char (1+ (nth 1 state)))
     (current-column)))
 
+(declare-function mail-position-on-field "sendmail" (field &optional soft))
+(declare-function mail-text "sendmail" ())
+
 (defun reporter-dump-variable (varsym mailbuf)
   "Pretty-print the value of the variable in symbol VARSYM.
 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)
@@ -200,8 +200,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) " ")))
@@ -246,8 +245,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")
@@ -409,5 +407,5 @@ mail-sending package is used for editing and sending the message."
 \f
 (provide 'reporter)
 
-;;; arch-tag: 33612ff4-fbbc-4be2-b183-560ce9e0199b
+;; arch-tag: 33612ff4-fbbc-4be2-b183-560ce9e0199b
 ;;; reporter.el ends here