[elpa] externals/ivy-hydra 25b6321 208/395: Fix recent counsel-recentf-candidates thinko

[Basil L. Contovounesios]

branch: externals/ivy-hydra
commit 25b63213e4070dd6aa7e7860d3afdb570c90de7d
Author: Basil L. Contovounesios <contovob@tcd.ie>
Commit: Basil L. Contovounesios <contovob@tcd.ie>

    Fix recent counsel-recentf-candidates thinko
    
    * counsel.el (counsel-recentf-candidates): Move declare-function to
    where it's needed and where it doesn't change the semantics of the
    top-level 'if' conditional.  Spotted by Akira Tamamori.
    Simplify time comparison by using time-less-p.
    
    Re: #2523
---
 counsel.el | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/counsel.el b/counsel.el
index e6657f7..4e79e04 100644
--- a/counsel.el
+++ b/counsel.el
@@ -2265,18 +2265,21 @@ the files in said list, sorting the combined list by 
file access
 time."
   (if (and counsel-recentf-include-xdg-list
            (>= emacs-major-version 26))
-      (declare-function file-attribute-access-time "files" (attributes))
       (delete-dups
-       (sort (append (mapcar #'substring-no-properties recentf-list)
-                     (counsel--recentf-get-xdg-recent-files))
+       (sort (nconc (mapcar #'substring-no-properties recentf-list)
+                    (counsel--recentf-get-xdg-recent-files))
              (lambda (file1 file2)
                (cond ((file-remote-p file1)
                       nil)
-                     ((file-remote-p file2)
-                      t)
+                     ((file-remote-p file2))
                      (t
-                      (> (time-to-seconds (file-attribute-access-time 
(file-attributes file1)))
-                         (time-to-seconds (file-attribute-access-time 
(file-attributes file2)))))))))
+                      ;; Added in Emacs 26.1.
+                      (declare-function file-attribute-access-time "files"
+                                        (attributes))
+                      (time-less-p (file-attribute-access-time
+                                    (file-attributes file2))
+                                   (file-attribute-access-time
+                                    (file-attributes file1))))))))
     (mapcar #'substring-no-properties recentf-list)))
 
 (defun counsel--strip-prefix (prefix str)