[Emacs-diffs] emacs/lisp ChangeLog mail/rmailsort.el

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/02/01 03:28:35

Modified files:
        lisp           : ChangeLog 
        lisp/mail      : rmailsort.el 

Log message:
        (rmail-sort-messages): Use car-less-than-car if possible.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15237&r2=1.15238
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mail/rmailsort.el?cvsroot=emacs&r1=1.43&r2=1.44

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15237
retrieving revision 1.15238
diff -u -b -r1.15237 -r1.15238
--- ChangeLog   1 Feb 2009 03:26:17 -0000       1.15237
+++ ChangeLog   1 Feb 2009 03:28:33 -0000       1.15238
@@ -1,5 +1,8 @@
 2009-02-01  Stefan Monnier  <address@hidden>
 
+       * mail/rmailsort.el (rmail-sort-messages): Use car-less-than-car
+       if possible.
+
        * mail/rmailedit.el (rmail-edit-map): Move init into declaration.
        (rmail-edit-mode, rmail-cease-edit): Use with-current-buffer.
 

Index: mail/rmailsort.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/mail/rmailsort.el,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- mail/rmailsort.el   23 Jan 2009 04:06:29 -0000      1.43
+++ mail/rmailsort.el   1 Feb 2009 03:28:35 -0000       1.44
@@ -162,7 +162,6 @@
     (let ((return-to-point
           (if (rmail-buffers-swapped-p)
               (point)))
-         (predicate nil)                       ;< or string-lessp
          (sort-lists nil))
       (rmail-swap-buffers-maybe)
       (message "Finding sort keys...")
@@ -179,15 +178,14 @@
              (message "Finding sort keys...%d" msgnum))
          (setq msgnum (1+ msgnum))))
       (or reverse (setq sort-lists (nreverse sort-lists)))
-      ;; Decide predicate: < or string-lessp
-      (if (numberp (car (car sort-lists))) ;Is a key numeric?
-         (setq predicate (function <))
-       (setq predicate (function string-lessp)))
       (setq sort-lists
            (sort sort-lists
+                  ;; Decide predicate: < or string-lessp
+                  (if (numberp (car (car sort-lists))) ;Is a key numeric?
+                      'car-less-than-car
                  (function
                   (lambda (a b)
-                    (funcall predicate (car a) (car b))))))
+                       (string-lessp (car a) (car b)))))))
       (if reverse (setq sort-lists (nreverse sort-lists)))
       ;; Now we enter critical region.  So, keyboard quit is disabled.
       (message "Reordering messages...")