comparison lisp/simple.el @ 44756:56b4ca0725c1

(line-move-finish): Find beg and end of line before calling line-move-to-column. Do consider intangible when finding the end. Take more care in analyzing the results of intangibility after line-move-to-column.

44755:52388a234829

  (let ((repeat t))
    (while repeat
      ;; Set REPEAT to t to repeat the whole thing.
      (setq repeat nil)

      ;; Move to the desired column.
      (line-move-to-column column)

      (let ((new (point))
	    (line-beg (save-excursion (beginning-of-line) (point)))
	    (line-end (save-excursion (end-of-line) (point))))

	;; Process intangibility within a line.
	;; Move to the chosen destination position from above,
	;; with intangibility processing enabled.

	  (goto-char new)

	  ;; If intangibility moves us to a different (later) place
	  ;; in the same line, use that as the destination.
	  (if (<= (point) line-end)
	      (setq new (point))))

	;; Now move to the updated destination, processing fields
	;; as well as intangibility.
	(goto-char opoint)
	(let ((inhibit-point-motion-hooks nil))
	  (goto-char
	   (constrain-to-field new opoint nil t
			       'inhibit-line-move-field-capture)))

	;; If intangibility processing moved us to a different line,
	;; retry everything within that new line.
	(when (or (< (point) line-beg) (> (point) line-end))
	  ;; Repeat the intangibility and field processing.
	  (setq repeat t))))))

44756:56b4ca0725c1

  (let ((repeat t))
    (while repeat
      ;; Set REPEAT to t to repeat the whole thing.
      (setq repeat nil)

      (let (new
	    (line-beg (save-excursion (beginning-of-line) (point)))
	    (line-end
	     ;; Compute the end of the line
	     ;; ignoring effectively intangible newlines.
	     (let ((inhibit-point-motion-hooks nil))
	       (save-excursion (end-of-line) (point)))))

	;; Move to the desired column.
	(line-move-to-column column)
	(setq new (point))

	;; Process intangibility within a line.
	;; Move to the chosen destination position from above,
	;; with intangibility processing enabled.

	  (goto-char new)

	  ;; If intangibility moves us to a different (later) place
	  ;; in the same line, use that as the destination.
	  (if (<= (point) line-end)
	      (setq new (point))
	    ;; If that position is "too late",
	    ;; try the previous allowable position.
	    ;; See if it is ok.
	    (backward-char)
	    (if (<= (point) line-end)
		(setq new (point))
	      ;; As a last resort, use the end of the line.
	      (setq new line-end))))

	;; Now move to the updated destination, processing fields
	;; as well as intangibility.
	(goto-char opoint)
	(let ((inhibit-point-motion-hooks nil))
	  (goto-char
	   (constrain-to-field new opoint nil t
			       'inhibit-line-move-field-capture)))

	;; If all this moved us to a different line,
	;; retry everything within that new line.
	(when (or (< (point) line-beg) (> (point) line-end))
	  ;; Repeat the intangibility and field processing.
	  (setq repeat t))))))