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

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       09/01/27 08:29:39

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

Log message:
        (rmail-copy-headers): Doc fix.  Leave point at the end
        of the headers in the full header case.  (Bug#2073)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15187&r2=1.15188
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mail/rmail.el?cvsroot=emacs&r1=1.470&r2=1.471

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15187
retrieving revision 1.15188
diff -u -b -r1.15187 -r1.15188
--- ChangeLog   27 Jan 2009 04:48:56 -0000      1.15187
+++ ChangeLog   27 Jan 2009 08:29:35 -0000      1.15188
@@ -1,3 +1,8 @@
+2009-01-27  Glenn Morris  <address@hidden>
+
+       * mail/rmail.el (rmail-copy-headers): Doc fix.  Leave point at the end
+       of the headers in the full header case.  (Bug#2073)
+
 2009-01-27  Kenichi Handa  <address@hidden>
 
        * mail/rmail.el (rmail-get-coding-system): Re-search

Index: mail/rmail.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/mail/rmail.el,v
retrieving revision 1.470
retrieving revision 1.471
diff -u -b -r1.470 -r1.471
--- mail/rmail.el       27 Jan 2009 04:49:33 -0000      1.470
+++ mail/rmail.el       27 Jan 2009 08:29:39 -0000      1.471
@@ -2563,7 +2563,8 @@
 those header fields whose names match that regexp.  Otherwise,
 copy all header fields whose names do not match
 `rmail-ignored-headers' (unless they also match
-`rmail-nonignored-headers')."
+`rmail-nonignored-headers').  Leaves point in the message viewer
+buffer at the end of the headers."
   (let ((header-start-regexp "\n[^ \t]")
        lim)
     (with-current-buffer rmail-buffer
@@ -2579,8 +2580,12 @@
          (cond
           ;; Handle the case where all headers should be copied.
           ((eq rmail-header-style 'full)
-           (prepend-to-buffer rmail-view-buffer beg (point-max)))
-          ;; Handle the case where the headers matching the diplayed
+           (prepend-to-buffer rmail-view-buffer beg (point-max))
+           ;; rmail-show-message expects this function to leave point
+           ;; at the end of the headers.
+           (with-current-buffer rmail-view-buffer
+             (search-forward "\n\n" nil t)))
+          ;; Handle the case where the headers matching the displayed
           ;; headers regexp should be copied.
           ((and rmail-displayed-headers (null ignored-headers))
            (while (not (eobp))