Revision: miles@gnu.org--gnu-2005/gnus--devo--0--patch-26

Merge from gnus--rel--5.10

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-57
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-58
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-8
 - miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-11
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-12
   Merge from emacs--cvs-trunk--0

2005-01-28  Stefan Monnier  <monnier@iro.umontreal.ca>

   * lisp/message.el (message-beginning-of-line): Change the behavior when
   invoked between BOL and : so that it first moves backward.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6ac1e4e..500ec11 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-28  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * message.el (message-beginning-of-line): Change the behavior when
+       invoked between BOL and : so that it first moves backward.
+
 2005-01-28  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus-art.el (gnus-article-setup-buffer): Kill and re-create the
@@ -159,8 +164,7 @@
 
        * mm-bodies.el (mm-body-encoding): Don't permit 7-bit to be used
        when mm-use-ultra-safe-encoding is enabled (e.g., for PGP/MIME)
-       and we have trailing white space.  Reported by Werner Koch
-       <wk@gnupg.org>.
+       and we have trailing white space.  Reported by Werner Koch <wk@gnupg.org>.
 
 2004-12-17  Kim F. Storm  <storm@cua.dk>
 
@@ -309,8 +313,8 @@
 
 2004-12-13  Katsumi Yamaoka  <yamaoka@jpl.org>
 
-       * gnus-group.el (gnus-group-make-rss-group): Use
-       gnus-group-make-group instead of gnus-group-unsubscribe-group.
+       * gnus-group.el (gnus-group-make-rss-group):
+       Use gnus-group-make-group instead of gnus-group-unsubscribe-group.
 
        * gnus-start.el (gnus-setup-news): Honor user's setting to
        gnus-message-archive-method.  Suggested by Lute Kamstra

diff --git a/lisp/message.el b/lisp/message.el
index 8c7cc85..9b1da37 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -5370,10 +5370,10 @@ outside the message header or if the option `message-beginning-of-line'
 is nil.
 
 If point is in the message header and on a (non-continued) header
-line, move point to the beginning of the header value.  If point
-is already there, move point to beginning of line.  Therefore,
-repeated calls will toggle point between beginning of field and
-beginning of line."
+line, move point to the beginning of the header value or the beginning of line,
+whichever is closer.  If point is already at beginning of line, move point to
+beginning of header value.  Therefore, repeated calls will toggle point
+between beginning of field and beginning of line."
   (interactive "p")
   (let ((zrs 'zmacs-region-stays))
     (when (and (interactive-p) (boundp zrs))
@@ -5384,9 +5384,9 @@ beginning of line."
             (bol (progn (beginning-of-line n) (point)))
             (eol (point-at-eol))
             (eoh (re-search-forward ": *" eol t)))
-       (if (or (not eoh) (equal here eoh))
-           (goto-char bol)
-         (goto-char eoh)))
+       (goto-char
+        (if (and eoh (or (< eoh here) (= bol here)))
+            eoh bol)))
     (beginning-of-line n)))
 
 (defun message-buffer-name (type &optional to group)
@@ -6978,5 +6978,5 @@ regexp VARSTR."
 ;; coding: iso-8859-1
 ;; End:
 
-;;; arch-tag: 94b32cac-4504-4b6c-8181-030ebf380ee0
+;; arch-tag: 94b32cac-4504-4b6c-8181-030ebf380ee0
 ;;; message.el ends here