changeset 79143:f6c37512dd9e

Merge from gnus--rel--5.10 Patches applied: * gnus--rel--5.10 (patch 257-258) - Merge from emacs--rel--22 - Update from CVS 2007-10-15 Katsumi Yamaoka <yamaoka@jpl.org> * lisp/gnus/gnus-util.el (gnus-string<): New function. * lisp/gnus/gnus-sum.el (gnus-article-sort-by-author) (gnus-article-sort-by-subject): Use it. 2007-10-15 Katsumi Yamaoka <yamaoka@jpl.org> * lisp/gnus/gnus-win.el (gnus-configure-windows): Focus on the frame for which the frame-focus tag is set in gnus-buffer-configuration. Revision: emacs@sv.gnu.org/emacs--rel--22--patch-128
author Miles Bader <miles@gnu.org>
date Thu, 18 Oct 2007 21:09:02 +0000
parents 4fab4ac447b1
children 3adf56a260f9 9fd4569b265a
files lisp/gnus/ChangeLog lisp/gnus/gnus-sum.el lisp/gnus/gnus-util.el lisp/gnus/gnus-win.el
diffstat 4 files changed, 25 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog	Thu Oct 18 21:00:43 2007 +0000
+++ b/lisp/gnus/ChangeLog	Thu Oct 18 21:09:02 2007 +0000
@@ -1,3 +1,15 @@
+2007-10-15  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* gnus-util.el (gnus-string<): New function.
+
+	* gnus-sum.el (gnus-article-sort-by-author)
+	(gnus-article-sort-by-subject): Use it.
+
+2007-10-15  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* gnus-win.el (gnus-configure-windows): Focus on the frame for which
+	the frame-focus tag is set in gnus-buffer-configuration.
+
 2007-10-08  Reiner Steib  <Reiner.Steib@gmx.de>
 
 	* mm-util.el (mm-charset-synonym-alist): Alias gbk to cp936.
--- a/lisp/gnus/gnus-sum.el	Thu Oct 18 21:00:43 2007 +0000
+++ b/lisp/gnus/gnus-sum.el	Thu Oct 18 21:09:02 2007 +0000
@@ -4674,7 +4674,7 @@
 
 (defsubst gnus-article-sort-by-author (h1 h2)
   "Sort articles by root author."
-  (string-lessp
+  (gnus-string<
    (let ((extract (funcall
 		   gnus-extract-address-components
 		   (mail-header-from h1))))
@@ -4691,7 +4691,7 @@
 
 (defsubst gnus-article-sort-by-subject (h1 h2)
   "Sort articles by root subject."
-  (string-lessp
+  (gnus-string<
    (downcase (gnus-simplify-subject-re (mail-header-subject h1)))
    (downcase (gnus-simplify-subject-re (mail-header-subject h2)))))
 
--- a/lisp/gnus/gnus-util.el	Thu Oct 18 21:00:43 2007 +0000
+++ b/lisp/gnus/gnus-util.el	Thu Oct 18 21:09:02 2007 +0000
@@ -290,6 +290,15 @@
   (not (or (string< s1 s2)
 	   (string= s1 s2))))
 
+(defun gnus-string< (s1 s2)
+  "Return t if first arg string is less than second in lexicographic order.
+Case is significant if and only if `case-fold-search' is nil.
+Symbols are also allowed; their print names are used instead."
+  (if case-fold-search
+      (string-lessp (downcase (if (symbolp s1) (symbol-name s1) s1))
+		    (downcase (if (symbolp s2) (symbol-name s2) s2)))
+    (string-lessp s1 s2)))
+
 ;;; Time functions.
 
 (defun gnus-file-newer-than (file date)
--- a/lisp/gnus/gnus-win.el	Thu Oct 18 21:00:43 2007 +0000
+++ b/lisp/gnus/gnus-win.el	Thu Oct 18 21:09:02 2007 +0000
@@ -471,7 +471,8 @@
 	  (gnus-configure-frame split)
 	  (run-hooks 'gnus-configure-windows-hook)
 	  (when gnus-window-frame-focus
-	    (select-frame (window-frame gnus-window-frame-focus))))))))
+	    (gnus-select-frame-set-input-focus
+	     (window-frame gnus-window-frame-focus))))))))
 
 (defun gnus-delete-windows-in-gnusey-frames ()
   "Do a `delete-other-windows' in all frames that have Gnus windows."