Merge from emacs--rel--22

Patches applied:

 * emacs--rel--22  (patch 128)

   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 257-258)

   - Merge from emacs--rel--22
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-897

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 89d9d75..59a3292 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -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-04  Juanma Barranquero  <lekktu@gmail.com>
 
        * sieve-manage.el (sieve-manage-interactive-login): Doc fix.

diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 36e9379..8fb18d3 100644 (file)
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -4674,7 +4674,7 @@ using some other form will lead to serious barfage."
 
 (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 @@ using some other form will lead to serious barfage."
 
 (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)))))
 

diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el
index 74aacdd..3d3e414 100644 (file)
--- a/lisp/gnus/gnus-util.el
+++ b/lisp/gnus/gnus-util.el
@@ -290,6 +290,15 @@ is slower."
   (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)

diff --git a/lisp/gnus/gnus-win.el b/lisp/gnus/gnus-win.el
index 5c57aaa..7e1609c 100644 (file)
--- a/lisp/gnus/gnus-win.el
+++ b/lisp/gnus/gnus-win.el
@@ -471,7 +471,8 @@ See the Gnus manual for an explanation of the syntax used.")
          (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."