[Emacs-diffs] /srv/bzr/emacs/trunk r111035: * textmodes/fill.el (fill-region-as-paragraph): Handle overshoot by move-to-column.

[Chong Yidong]

------------------------------------------------------------
revno: 111035
fixes bug: http://debbugs.gnu.org/3234
author: Toru TSUNEYOSHI <address@hidden>
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Fri 2012-11-30 15:10:30 +0800
message:
  * textmodes/fill.el (fill-region-as-paragraph): Handle overshoot by 
move-to-column.
modified:
  lisp/ChangeLog
  lisp/textmodes/fill.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-11-30 06:56:51 +0000
+++ b/lisp/ChangeLog    2012-11-30 07:10:30 +0000
@@ -1,3 +1,8 @@
+2012-11-30  Toru TSUNEYOSHI  <address@hidden>
+
+       * textmodes/fill.el (fill-region-as-paragraph): Handle overshoot
+       by move-to-column (Bug#3234).
+
 2012-11-30  Chong Yidong  <address@hidden>
 
        * longlines.el (longlines-wrap-line, longlines-encode-region):

=== modified file 'lisp/textmodes/fill.el'
--- a/lisp/textmodes/fill.el    2012-04-10 02:06:19 +0000
+++ b/lisp/textmodes/fill.el    2012-11-30 07:10:30 +0000
@@ -721,7 +721,11 @@
            (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.