diff options
| author | Richard M. Stallman | 2006-10-02 02:30:06 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 2006-10-02 02:30:06 +0000 |
| commit | 1f8a132d060bc079ff723466518b5ac4ef4ba6b6 (patch) | |
| tree | 6e04f5c92f3567edfad96a6fb6ddc6845279ea88 | |
| parent | 8f1a5a9b18f83bf8044d0b79cd83707d9d75ef32 (diff) | |
| download | emacs-1f8a132d060bc079ff723466518b5ac4ef4ba6b6.tar.gz emacs-1f8a132d060bc079ff723466518b5ac4ef4ba6b6.zip | |
(undo-elt-crosses-region): Fix the inequalities.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/simple.el | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ade0bda6362..9deec93eb24 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2006-10-01 Johan Bockg,Ae(Brd <bojohan+mail@dd.chalmers.se> | ||
| 2 | |||
| 3 | * simple.el (undo-elt-crosses-region): Fix the inequalities. | ||
| 4 | |||
| 1 | 2006-10-01 Stefan Monnier <monnier@iro.umontreal.ca> | 5 | 2006-10-01 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 6 | ||
| 3 | * emacs-lisp/find-func.el (find-function-regexp): Don't match | 7 | * emacs-lisp/find-func.el (find-function-regexp): Don't match |
diff --git a/lisp/simple.el b/lisp/simple.el index 105c5a9afce..8bd3a30a59b 100644 --- a/lisp/simple.el +++ b/lisp/simple.el | |||
| @@ -1648,12 +1648,12 @@ is not *inside* the region START...END." | |||
| 1648 | ((null (car undo-elt)) | 1648 | ((null (car undo-elt)) |
| 1649 | ;; (nil PROPERTY VALUE BEG . END) | 1649 | ;; (nil PROPERTY VALUE BEG . END) |
| 1650 | (let ((tail (nthcdr 3 undo-elt))) | 1650 | (let ((tail (nthcdr 3 undo-elt))) |
| 1651 | (not (or (< (car tail) end) | 1651 | (and (< (car tail) end) |
| 1652 | (> (cdr tail) start))))) | 1652 | (> (cdr tail) start)))) |
| 1653 | ((integerp (car undo-elt)) | 1653 | ((integerp (car undo-elt)) |
| 1654 | ;; (BEGIN . END) | 1654 | ;; (BEGIN . END) |
| 1655 | (not (or (< (car undo-elt) end) | 1655 | (and (< (car undo-elt) end) |
| 1656 | (> (cdr undo-elt) start)))))) | 1656 | (> (cdr undo-elt) start))))) |
| 1657 | 1657 | ||
| 1658 | ;; Return the first affected buffer position and the delta for an undo element | 1658 | ;; Return the first affected buffer position and the delta for an undo element |
| 1659 | ;; delta is defined as the change in subsequent buffer positions if we *did* | 1659 | ;; delta is defined as the change in subsequent buffer positions if we *did* |