From 16c71d6b782010924309a267b12689b0ccb950c4 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 26 Jun 2014 22:00:27 +0200 Subject: [PATCH] org-element: Small refactoring * lisp/org-element.el (org-element--cache-generate-key): Small refactoring. --- lisp/org-element.el | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/lisp/org-element.el b/lisp/org-element.el index edea24142..bb38d96c9 100644 --- a/lisp/org-element.el +++ b/lisp/org-element.el @@ -4817,11 +4817,8 @@ lesser than UPPER, per `org-element--cache-key-less-p'." ((car upper)) (t most-positive-fixnum)))) (if (< (1+ min) max) - (let* ((mean (+ (ash min -1) (ash max -1))) - ;; Fix MEAN when both MIN and MAX are odd. - (new (if (zerop (logand min max 1)) mean (1+ mean)))) - ;; Ensure we don't return a singleton. - (throw 'exit (if key (nreverse (cons new key)) new))) + (let ((mean (+ (ash min -1) (ash max -1) (logand min max 1)))) + (throw 'exit (if key (nreverse (cons mean key)) mean))) (when (and (< min max) (not skip-upper)) ;; When at a given level, LOWER and UPPER differ from ;; 1, ignore UPPER altogether. Instead create a key