mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-05 22:20:24 -08:00
Code Issues Projects Releases Wiki Activity

* lisp/allout.el, lisp/allout-widgets.el: Use cl-lib and pcase

Browse source
This commit is contained in:
Stefan Monnier 2019-05-22 23:21:47 -04:00
parent 03feb9376b
commit b95a5d194b
2 changed files with 63 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

41
lisp/allout-widgets.el
View file

@ -70,12 +70,7 @@
(require 'allout)
(require 'widget)
(require 'wid-edit)
(eval-when-compile
(progn
(require 'overlay)
(require 'cl)
))
(eval-when-compile (require 'cl-lib))
;;;_ : internal variables needed before user-customization variables
;;; In order to enable activation of allout-widgets-mode via customization,
@ -960,7 +955,7 @@ posting threshold criteria."
(when changes-pending
(while changes-record
(setq entry (pop changes-record))
(case (car entry)
(pcase (car entry)
(:exposed (push entry exposures))
(:added (push entry additions))
(:deleted (push entry deletions))
@ -1378,34 +1373,34 @@ FROM and TO must be in increasing order, as must be the pairs in RANGES."
;; fresh:
(setq ranges nil)
(assert (equal (funcall try 3 5) '(nil ((3 5)))))
(cl-assert (equal (funcall try 3 5) '(nil ((3 5)))))
;; add range at end:
(assert (equal (funcall try 10 12) '(nil ((3 5) (10 12)))))
(cl-assert (equal (funcall try 10 12) '(nil ((3 5) (10 12)))))
;; add range at beginning:
(assert (equal (funcall try 1 2) '(nil ((1 2) (3 5) (10 12)))))
(cl-assert (equal (funcall try 1 2) '(nil ((1 2) (3 5) (10 12)))))
;; insert range somewhere in the middle:
(assert (equal (funcall try 7 9) '(nil ((1 2) (3 5) (7 9) (10 12)))))
(cl-assert (equal (funcall try 7 9) '(nil ((1 2) (3 5) (7 9) (10 12)))))
;; consolidate some:
(assert (equal (funcall try 5 8) '(t ((1 2) (3 9) (10 12)))))
(cl-assert (equal (funcall try 5 8) '(t ((1 2) (3 9) (10 12)))))
;; add more:
(assert (equal (funcall try 15 17) '(nil ((1 2) (3 9) (10 12) (15 17)))))
(cl-assert (equal (funcall try 15 17) '(nil ((1 2) (3 9) (10 12) (15 17)))))
;; add more:
(assert (equal (funcall try 20 22)
(cl-assert (equal (funcall try 20 22)
'(nil ((1 2) (3 9) (10 12) (15 17) (20 22)))))
;; encompass more:
(assert (equal (funcall try 4 11) '(t ((1 2) (3 12) (15 17) (20 22)))))
(cl-assert (equal (funcall try 4 11) '(t ((1 2) (3 12) (15 17) (20 22)))))
;; encompass all:
(assert (equal (funcall try 2 25) '(t ((1 25)))))
(cl-assert (equal (funcall try 2 25) '(t ((1 25)))))
;; fresh slate:
(setq ranges nil)
(assert (equal (funcall try 20 25) '(nil ((20 25)))))
(assert (equal (funcall try 30 35) '(nil ((20 25) (30 35)))))
(assert (equal (funcall try 26 28) '(nil ((20 25) (26 28) (30 35)))))
(assert (equal (funcall try 15 20) '(t ((15 25) (26 28) (30 35)))))
(assert (equal (funcall try 10 30) '(t ((10 35)))))
(assert (equal (funcall try 5 6) '(nil ((5 6) (10 35)))))
(assert (equal (funcall try 2 100) '(t ((2 100)))))
(cl-assert (equal (funcall try 20 25) '(nil ((20 25)))))
(cl-assert (equal (funcall try 30 35) '(nil ((20 25) (30 35)))))
(cl-assert (equal (funcall try 26 28) '(nil ((20 25) (26 28) (30 35)))))
(cl-assert (equal (funcall try 15 20) '(t ((15 25) (26 28) (30 35)))))
(cl-assert (equal (funcall try 10 30) '(t ((10 35)))))
(cl-assert (equal (funcall try 5 6) '(nil ((5 6) (10 35)))))
(cl-assert (equal (funcall try 2 100) '(t ((2 100)))))
(setq ranges nil)
))