diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-03-06 16:22:16 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-03-06 16:22:16 -0500 |
| commit | 0d6459dfb52188481bfd6bb53f1b2f653ecd6a5d (patch) | |
| tree | 306b87fc2903ad23343f3c84be1cccfa72e5a97e /lisp/gnus/gnus-range.el | |
| parent | 798cb64441228d473f7bdd213183c70fb582595c (diff) | |
| parent | 892777baa1739fa5f1f2d1c2975488c3e6f57bae (diff) | |
| download | emacs-0d6459dfb52188481bfd6bb53f1b2f653ecd6a5d.tar.gz emacs-0d6459dfb52188481bfd6bb53f1b2f653ecd6a5d.tar.bz2 emacs-0d6459dfb52188481bfd6bb53f1b2f653ecd6a5d.zip | |
Merge from trunk
Diffstat (limited to 'lisp/gnus/gnus-range.el')
| -rw-r--r-- | lisp/gnus/gnus-range.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/gnus/gnus-range.el b/lisp/gnus/gnus-range.el index 794d1642cdd..ce5a837eaef 100644 --- a/lisp/gnus/gnus-range.el +++ b/lisp/gnus/gnus-range.el @@ -116,10 +116,10 @@ Both ranges must be in ascending order." ;; All done with range2 (setq r nil)) ((< max1 min2) - ;; No overlap: range1 preceeds range2 + ;; No overlap: range1 precedes range2 (pop r)) ((< max2 min1) - ;; No overlap: range2 preceeds range1 + ;; No overlap: range2 precedes range1 (pop range2)) ((and (<= min2 min1) (<= max1 max2)) ;; Complete overlap: range1 removed @@ -232,10 +232,10 @@ RANGE1 and RANGE2 have to be sorted over <." (setq range1 (cdr range1) range2 (cdr range2)) (while (and min1 min2) - (cond ((< max1 min2) ; range1 preceeds range2 + (cond ((< max1 min2) ; range1 precedes range2 (setq range1 (cdr range1) min1 nil)) - ((< max2 min1) ; range2 preceeds range1 + ((< max2 min1) ; range2 precedes range1 (setq range2 (cdr range2) min2 nil)) (t ; some sort of overlap is occurring |