Quoting fixes

[gnus] / lisp / rtree.el

diff --git a/lisp/rtree.el b/lisp/rtree.el
index b3e21f3..50a860a 100644 (file)
--- a/lisp/rtree.el
+++ b/lisp/rtree.el
@@ -1,24 +1,23 @@
 ;;; rtree.el --- functions for manipulating range trees
-;; Copyright (C) 2010 Free Software Foundation, Inc.
+
+;; Copyright (C) 2010-2015 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -80,11 +79,14 @@
 (defmacro rtree-range (node)
   `(car ,node))
 
-(defsubst rtree-normalise-range (range)
+(defsubst rtree-normalize-range (range)
   (when (numberp range)
     (setq range (cons range range)))
   range)
 
+(define-obsolete-function-alias 'rtree-normalise-range
+  'rtree-normalize-range "25.1")
+
 (defun rtree-make (range)
   "Make an rtree from RANGE."
   ;; Normalize the range.
@@ -97,7 +99,7 @@
        (node (rtree-make-node)))
     (when (> mid 0)
       (rtree-set-left node (rtree-make-1 range mid)))
-    (rtree-set-range node (rtree-normalise-range (cadr range)))
+    (rtree-set-range node (rtree-normalize-range (cadr range)))
     (setcdr range (cddr range))
     (when (> (- length mid 1) 0)
       (rtree-set-right node (rtree-make-1 range (- length mid 1))))
@@ -265,6 +267,15 @@
        (setq tree (rtree-left tree))))
     result))
 
+(defun rtree-length (tree)
+  "Return the number of numbers stored in TREE."
+  (if (null tree)
+      0
+    (+ (rtree-length (rtree-left tree))
+       (1+ (- (rtree-high tree)
+             (rtree-low tree)))
+       (rtree-length (rtree-right tree)))))
+
 (provide 'rtree)
 
 ;;; rtree.el ends here