auto upstream

2 files changed, 10 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e0b140bc276..eef59e75ac8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-30  Toru TSUNEYOSHI  <t_tuneyosi@hotmail.com>
+
+        * textmodes/fill.el (fill-region-as-paragraph): Handle overshoot
+        by move-to-column (Bug#3234).
+
 2012-11-30  Chong Yidong  <cyd@gnu.org>
 
         * longlines.el (longlines-wrap-line, longlines-encode-region):
diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index d0e90c99516..86a1736783d 100644
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -721,7 +721,11 @@ space does not end a sentence, so don't break a line there."
             (move-to-column (current-fill-column))
             (if (when (< (point) to)
                   ;; Find the position where we'll break the line.
-                  (forward-char 1) ;Use an immediately following space, if any.
+                  ;; Use an immediately following space, if any.
+                  ;; However, note that `move-to-column' may overshoot
+                  ;; if there are wide characters (Bug#3234).
+                  (unless (> (current-column) (current-fill-column))
+                    (forward-char 1))
                   (fill-move-to-break-point linebeg)
                   ;; Check again to see if we got to the end of
                   ;; the paragraph.