[Emacs-diffs] /srv/bzr/emacs/trunk r103014: Merge changes made in Gnus trunk.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 103014
author: Gnus developers <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Fri 2011-01-28 23:07:38 +0000
message:
  Merge changes made in Gnus trunk.
  
  gnus-win.el: Remove dead function gnus-window-configuration-element.
   (gnus-all-windows-visible-p): Remove old compatibility code.
   (gnus-window-top-edge): Add docstring.
  gnus-sum.el (gnus-select-newsgroup): Don't try to alter the active data if 
the group is unactivated.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-sum.el
  lisp/gnus/gnus-win.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2011-01-28 11:27:24 +0000
+++ b/lisp/gnus/ChangeLog       2011-01-28 23:07:38 +0000
@@ -1,5 +1,14 @@
+2011-01-28  Lars Ingebrigtsen  <address@hidden>
+
+       * gnus-sum.el (gnus-select-newsgroup): Don't try to alter the active
+       data if the group is unactivated.
+
 2011-01-28  Julien Danjou  <address@hidden>
 
+       * gnus-win.el: Remove dead function gnus-window-configuration-element.
+       (gnus-all-windows-visible-p): Remove old compatibility code.
+       (gnus-window-top-edge): Add docstring.
+
        * gnus-group.el (gnus-group-jump-to-group): Set must match to t.
 
 2011-01-28  Lars Ingebrigtsen  <address@hidden>

=== modified file 'lisp/gnus/gnus-sum.el'
--- a/lisp/gnus/gnus-sum.el     2011-01-27 23:56:27 +0000
+++ b/lisp/gnus/gnus-sum.el     2011-01-28 23:07:38 +0000
@@ -5542,7 +5542,8 @@
             (mm-decode-coding-string group charset)
             (mm-decode-coding-string (gnus-status-message group) charset)))
 
-    (when gnus-agent
+    (when (and gnus-agent
+              (gnus-active group))
       (gnus-agent-possibly-alter-active group (gnus-active group) info)
 
       (setq gnus-summary-use-undownloaded-faces

=== modified file 'lisp/gnus/gnus-win.el'
--- a/lisp/gnus/gnus-win.el     2011-01-25 04:08:28 +0000
+++ b/lisp/gnus/gnus-win.el     2011-01-28 23:07:38 +0000
@@ -38,9 +38,6 @@
   :group 'gnus-windows
   :type 'boolean)
 
-(defvar gnus-window-configuration nil
-  "Obsolete variable.  See `gnus-buffer-configuration'.")
-
 (defcustom gnus-window-min-width 2
   "*Minimum width of Gnus buffers."
   :group 'gnus-windows
@@ -221,12 +218,6 @@
        (delete-frame (car gnus-created-frames))))
     (pop gnus-created-frames)))
 
-(defun gnus-window-configuration-element (list)
-  (while (and list
-             (not (assq (car list) gnus-window-configuration)))
-    (pop list))
-  (cadr (assq (car list) gnus-window-configuration)))
-
 ;;;###autoload
 (defun gnus-add-configuration (conf)
   "Add the window configuration CONF to `gnus-buffer-configuration'."
@@ -446,11 +437,7 @@
        type buffer win buf)
     (while (and (setq split (pop stack))
                all-visible)
-      ;; Be backwards compatible.
-      (when (vectorp split)
-       (setq split (append split nil)))
-      (when (or (consp (car split))
-               (vectorp (car split)))
+      (when (consp (car split))
        (push 1.0 split)
        (push 'vertical split))
       ;; The SPLIT might be something that is to be evaled to
@@ -482,6 +469,7 @@
       all-visible)))
 
 (defun gnus-window-top-edge (&optional window)
+  "Return the top coordinate of WINDOW."
   (nth 1 (window-edges window)))
 
 (defun gnus-remove-some-windows ()