* simple.el (line-move-to-column): Revert 2006-08-03 change.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c4342057a6f4b4e438c1419050d7316bbd64b5c6..2aeb97e79ff5dbefad41ca38696e7d8533df3038 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2006-09-16  Chong Yidong  <cyd@stupidchicken.com>
+
+       * simple.el (line-move-to-column): Revert 2006-08-03 change.
+
 2006-09-16  Eli Zaretskii  <eliz@gnu.org>
 
        * help.el (describe-prefix-bindings): Use let, not let*.

diff --git a/lisp/simple.el b/lisp/simple.el
index 5c7cca5b31e0b3da3a2b2fadba27fbb8c2e4a394..7d1b71fc4983e8ee76674900d3f68b61db74391f 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -3645,6 +3645,9 @@ Outline mode sets this."
          ;; This is the value the function returns.
          (= arg 0))
 
+      (setq foo (list (point)
+                     (or goal-column temporary-goal-column)
+                     opoint forward))
       (cond ((> arg 0)
             ;; If we did not move down as far as desired,
             ;; at least go to end of line.
@@ -3678,6 +3681,7 @@ Outline mode sets this."
 
        ;; Move to the desired column.
        (line-move-to-column column)
+       (push (list (point) line-beg line-end) foo)
        (setq new (point))
 
        ;; Process intangibility within a line.
@@ -3733,10 +3737,7 @@ because what we really need is for `move-to-column'
 and `current-column' to be able to ignore invisible text."
   (if (zerop col)
       (beginning-of-line)
-    (let ((opoint (point)))
-      (move-to-column col)
-      ;; move-to-column doesn't respect field boundaries.
-      (goto-char (constrain-to-field (point) opoint))))
+    (move-to-column col))
 
   (when (and line-move-ignore-invisible
             (not (bolp)) (line-move-invisible-p (1- (point))))