[Emacs-diffs] emacs/lisp ChangeLog mail/emacsbug.el

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       09/12/13 23:43:20

Modified files:
        lisp           : ChangeLog 
        lisp/mail      : emacsbug.el 

Log message:
        (report-emacs-bug): In message-mode, sort manually before storing
        original report text.  (Bug#5178)
        Remove superfluous save-excursion.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16897&r2=1.16898
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mail/emacsbug.el?cvsroot=emacs&r1=1.95&r2=1.96

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16897
retrieving revision 1.16898
diff -u -b -r1.16897 -r1.16898
--- ChangeLog   12 Dec 2009 19:18:33 -0000      1.16897
+++ ChangeLog   13 Dec 2009 23:43:17 -0000      1.16898
@@ -1,3 +1,9 @@
+2009-12-13  Glenn Morris  <address@hidden>
+
+       * mail/emacsbug.el (report-emacs-bug): In message-mode, sort manually
+       before storing original report text.  (Bug#5178)
+       Remove superfluous save-excursion.
+
 2009-12-12  Michael Albinus  <address@hidden>
 
        * net/dbus.el (dbus-property-handler): Filter lambda forms out

Index: mail/emacsbug.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/mail/emacsbug.el,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -b -r1.95 -r1.96
--- mail/emacsbug.el    11 Dec 2009 01:21:38 -0000      1.95
+++ mail/emacsbug.el    13 Dec 2009 23:43:20 -0000      1.96
@@ -106,11 +106,14 @@
          (with-current-buffer (get-buffer-create "*Messages*")
            (point-max-marker)))
     (compose-mail reporting-address topic)
-    ;; The rest of this does not execute
-    ;; if the user was asked to confirm and said no.
+    ;; The rest of this does not execute if the user was asked to
+    ;; confirm and said no.
+    ;; Message-mode sorts the headers before sending.  We sort now so
+    ;; that report-emacs-bug-orig-text remains valid.  (Bug#5178)
+    (if (eq major-mode 'message-mode)
+        (message-sort-headers))
     (rfc822-goto-eoh)
     (forward-line 1)
-
     (let ((signature (buffer-substring (point) (point-max))))
       (delete-region (point) (point-max))
       (insert signature)
@@ -262,12 +265,11 @@
     ;; Make it less likely people will send empty messages.
     (if report-emacs-bug-send-hook
         (add-hook report-emacs-bug-send-hook 'report-emacs-bug-hook nil t))
-    (save-excursion
       (goto-char (point-max))
       (skip-chars-backward " \t\n")
       (make-local-variable 'report-emacs-bug-orig-text)
       (setq report-emacs-bug-orig-text
-            (buffer-substring-no-properties (point-min) (point))))
+          (buffer-substring-no-properties (point-min) (point)))
     (goto-char user-point)))
 
 (defun report-emacs-bug-info ()