diff options
| author | Glenn Morris <rgm@gnu.org> | 2011-02-27 17:07:29 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2011-02-27 17:07:29 -0800 |
| commit | 2b0c7330457b8ca42375c92ada7dc7cefb0fa9fb (patch) | |
| tree | b924eb1c22ab3bce643676162ef039f250782661 /lisp/gnus/gnus-range.el | |
| parent | df7f0d0b10ce31a6f1a8b7e979e120c695699d5a (diff) | |
| parent | d1f61aaf6f0b6a2cf2bbb7eaf5631f8b580568d4 (diff) | |
| download | emacs-2b0c7330457b8ca42375c92ada7dc7cefb0fa9fb.tar.gz emacs-2b0c7330457b8ca42375c92ada7dc7cefb0fa9fb.tar.bz2 emacs-2b0c7330457b8ca42375c92ada7dc7cefb0fa9fb.zip | |
Merge from emacs-23; up to 2010-06-03T05:41:49Z!rgm@gnu.org.
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 |