procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix imenu--sort-by-position for non-pairs parameters (bug#26457)

Browse source 
* lisp/imenu.el (imenu--sort-by-position): Fix to accept lists beyond
  pairs.
* test/lisp/imenu-tests.el: Add 2 tests for `imenu--sort-by-position`.
This commit is contained in:
Damien Cassou 2017-04-12 07:35:56 +02:00 • committed by Nicolas Petton
parent 88e012511a
commit 4e77ff0d45
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lisp/imenu.el
View file

@ -499,7 +499,12 @@ An item looks like (NAME . POSITION)."
(string-lessp (car item1) (car item2)))
(defun imenu--sort-by-position (item1 item2)
(< (cdr item1) (cdr item2)))
"Comparison function to sort items depending on their position.
Return non-nil if and only if ITEM1's position is lower than ITEM2's
position."
(if (listp (cdr item1))
(< (cadr item1) (cadr item2))
(< (cdr item1) (cdr item2))))
(defun imenu--relative-position (&optional reverse)
"Support function to calculate relative position in buffer.

10
test/lisp/imenu-tests.el
View file

@ -83,6 +83,16 @@ function ABC_D()
}
" '("a" "b" "c" "ABC_D"))
(ert-deftest imenu--sort-by-position-pairs ()
(should (imenu--sort-by-position '("a" . 2) '("a" . 3)))
(should-not (imenu--sort-by-position '("a" . 3) '("a" . 2))))
;; Regression test for bug#26457: 25.2; Cannot pass a function to
;; imenu-generic-expression
(ert-deftest imenu--sort-by-position-list ()
(should (imenu--sort-by-position '("a" 2 nil) '("a" 3 nil)))
(should-not (imenu--sort-by-position '("a" 3 nil) '("a" 2 nil))))
(provide 'imenu-tests)
;;; imenu-tests.el ends here