message.el (message-beginning-of-line): Use beginning-of-visual-line when visual...

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5dc27dd..b1422cb 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-20  Dave Goldberg  <david.goldberg6@verizon.net>
+
+       * message.el (message-beginning-of-line):
+       Use beginning-of-visual-line when visual-line-mode is turned on.
+
 2013-11-15  Jan Tatarik  <jan.tatarik@gmail.com>
 
        * gnus-icalendar.el (gnus-icalendar-event->gnus-calendar)

diff --git a/lisp/message.el b/lisp/message.el
index 7f376e6..6e1e964 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -6315,6 +6315,9 @@ they are."
   :link '(custom-manual "(message)Movement")
   :type 'boolean)
 
+(defvar visual-line-mode)
+(declare-function beginning-of-visual-line "simple" (&optional n))
+
 (defun message-beginning-of-line (&optional n)
   "Move point to beginning of header value or to beginning of line.
 The prefix argument N is passed directly to `beginning-of-line'.
@@ -6341,7 +6344,9 @@ between beginning of field and beginning of line."
        (goto-char
         (if (and eoh (or (< eoh here) (= bol here)))
             eoh bol)))
-    (beginning-of-line n)))
+    (if (and (boundp 'visual-line-mode) visual-line-mode)
+       (beginning-of-visual-line n)
+      (beginning-of-line n))))
 
 (defun message-buffer-name (type &optional to group)
   "Return a new (unique) buffer name based on TYPE and TO."