[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/simple.el
From: |
Richard M . Stallman |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/simple.el |
Date: |
Sat, 20 Nov 2004 14:14:51 -0500 |
Index: emacs/lisp/simple.el
diff -c emacs/lisp/simple.el:1.666 emacs/lisp/simple.el:1.667
*** emacs/lisp/simple.el:1.666 Mon Nov 8 16:59:43 2004
--- emacs/lisp/simple.el Sat Nov 20 19:08:45 2004
***************
*** 3107,3112 ****
--- 3107,3113 ----
;; for intermediate positions.
(let ((inhibit-point-motion-hooks t)
(opoint (point))
+ (forward (> arg 0))
new line-end line-beg)
(unwind-protect
(progn
***************
*** 3181,3189 ****
;; at least go to end of line.
(beginning-of-line))
(t
! (line-move-finish (or goal-column temporary-goal-column)
opoint))))))
! (defun line-move-finish (column opoint)
(let ((repeat t))
(while repeat
;; Set REPEAT to t to repeat the whole thing.
--- 3182,3191 ----
;; at least go to end of line.
(beginning-of-line))
(t
! (line-move-finish (or goal-column temporary-goal-column)
! opoint forward))))))
! (defun line-move-finish (column opoint forward)
(let ((repeat t))
(while repeat
;; Set REPEAT to t to repeat the whole thing.
***************
*** 3193,3202 ****
(line-beg (save-excursion (beginning-of-line) (point)))
(line-end
;; Compute the end of the line
! ;; ignoring effectively intangible newlines.
(save-excursion
! (let ((inhibit-point-motion-hooks nil)
! (inhibit-field-text-motion t))
(end-of-line))
(point))))
--- 3195,3205 ----
(line-beg (save-excursion (beginning-of-line) (point)))
(line-end
;; Compute the end of the line
! ;; ignoring effectively invisible newlines.
(save-excursion
! (end-of-line)
! (while (and (not (eobp)) (line-move-invisible-p (point)))
! (goto-char (next-char-property-change (point)))
(end-of-line))
(point))))
***************
*** 3220,3226 ****
;; 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))))
--- 3223,3235 ----
;; try the previous allowable position.
;; See if it is ok.
(backward-char)
! (if (if forward
! ;; If going forward, don't accept the previous
! ;; allowable position if it is before the target line.
! (< line-beg (point))
! ;; If going backward, don't accept the previous
! ;; allowable position if it is still after the target line.
! (<= (point) line-end))
(setq new (point))
;; As a last resort, use the end of the line.
(setq new line-end))))