lisp/gnus/ChangeLog: Cosmetic fix.

[gnu-emacs] / lisp / gnus / gnus-win.el

diff --git a/lisp/gnus/gnus-win.el b/lisp/gnus/gnus-win.el
index cfdfdbaf13726fe06fbeb6d265dcca89e1e1e323..809e4c339beab38341159dbd0266c77ffbcb571f 100644 (file)
--- a/lisp/gnus/gnus-win.el
+++ b/lisp/gnus/gnus-win.el
@@ -1,27 +1,25 @@
 ;;; gnus-win.el --- window configuration functions for Gnus
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 ;;; gnus-win.el --- window configuration functions for Gnus
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,

-;;   2005, 2006, 2007 Free Software Foundation, Inc.
+;;   2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.

 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
 
 ;; This file is part of GNU Emacs.
 
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
 
 ;; This file is part of GNU Emacs.
 

-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify

 ;; it under the terms of the GNU General Public License as published by
 ;; it under the terms of the GNU General Public License as published by

-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.

 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of

-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License

-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.

 
 ;;; Commentary:
 
 
 ;;; Commentary:
 


@@ -70,12 +68,10 @@ used to display Gnus windows."
 (defvar gnus-buffer-configuration
   '((group
      (vertical 1.0
 (defvar gnus-buffer-configuration
   '((group
      (vertical 1.0

-              (group 1.0 point)
-              (if gnus-carpal '(group-carpal 4))))
+              (group 1.0 point)))

     (summary
      (vertical 1.0
     (summary
      (vertical 1.0

-              (summary 1.0 point)
-              (if gnus-carpal '(summary-carpal 4))))
+              (summary 1.0 point)))

     (article
      (cond
       (gnus-use-trees
     (article
      (cond
       (gnus-use-trees


@@ -86,16 +82,13 @@ used to display Gnus windows."
       (t
        '(vertical 1.0
                  (summary 0.25 point)
       (t
        '(vertical 1.0
                  (summary 0.25 point)

-                 (if gnus-carpal '(summary-carpal 4))

                  (article 1.0)))))
     (server
      (vertical 1.0
                  (article 1.0)))))
     (server
      (vertical 1.0

-              (server 1.0 point)
-              (if gnus-carpal '(server-carpal 2))))
+              (server 1.0 point)))

     (browse
      (vertical 1.0
     (browse
      (vertical 1.0

-              (browse 1.0 point)
-              (if gnus-carpal '(browse-carpal 2))))
+              (browse 1.0 point)))

     (message
      (vertical 1.0
               (message 1.0 point)))
     (message
      (vertical 1.0
               (message 1.0 point)))


@@ -109,6 +102,9 @@ used to display Gnus windows."
      (vertical 1.0
               (summary 0.25)
               (faq 1.0 point)))
      (vertical 1.0
               (summary 0.25)
               (faq 1.0 point)))

+    (only-article
+     (vertical 1.0
+              (article 1.0 point)))

     (edit-article
      (vertical 1.0
               (article 1.0 point)))
     (edit-article
      (vertical 1.0
               (article 1.0 point)))


@@ -120,6 +116,10 @@ used to display Gnus windows."
      (vertical 1.0
               (summary 0.25)
               (edit-score 1.0 point)))
      (vertical 1.0
               (summary 0.25)
               (edit-score 1.0 point)))

+    (edit-server
+     (vertical 1.0
+              (server 0.5)
+              (edit-form 1.0 point)))

     (post
      (vertical 1.0
               (post 1.0 point)))
     (post
      (vertical 1.0
               (post 1.0 point)))


@@ -140,7 +140,6 @@ used to display Gnus windows."
     (pipe
      (vertical 1.0
               (summary 0.25 point)
     (pipe
      (vertical 1.0
               (summary 0.25 point)

-              (if gnus-carpal '(summary-carpal 4))

               ("*Shell Command Output*" 1.0)))
     (bug
      (vertical 1.0
               ("*Shell Command Output*" 1.0)))
     (bug
      (vertical 1.0


@@ -166,8 +165,12 @@ used to display Gnus windows."
               (article 0.5)
               (message 1.0 point)))
     (display-term
               (article 0.5)
               (message 1.0 point)))
     (display-term

-      (vertical 1.0
-               ("*display*" 1.0))))
+     (vertical 1.0
+              ("*display*" 1.0)))
+    (mml-preview
+     (vertical 1.0
+              (message 0.5)
+              (mml-preview 1.0 point))))

   "Window configuration for all possible Gnus buffers.
 See the Gnus manual for an explanation of the syntax used.")
 
   "Window configuration for all possible Gnus buffers.
 See the Gnus manual for an explanation of the syntax used.")
 


@@ -180,10 +183,6 @@ See the Gnus manual for an explanation of the syntax used.")
     (edit-group . gnus-group-edit-buffer)
     (edit-form . gnus-edit-form-buffer)
     (edit-server . gnus-server-edit-buffer)
     (edit-group . gnus-group-edit-buffer)
     (edit-form . gnus-edit-form-buffer)
     (edit-server . gnus-server-edit-buffer)

-    (group-carpal . gnus-carpal-group-buffer)
-    (summary-carpal . gnus-carpal-summary-buffer)
-    (server-carpal . gnus-carpal-server-buffer)
-    (browse-carpal . gnus-carpal-browse-buffer)

     (edit-score . gnus-score-edit-buffer)
     (message . gnus-message-buffer)
     (mail . gnus-message-buffer)
     (edit-score . gnus-score-edit-buffer)
     (message . gnus-message-buffer)
     (mail . gnus-message-buffer)


@@ -195,7 +194,8 @@ See the Gnus manual for an explanation of the syntax used.")
     (info . gnus-info-buffer)
     (category . gnus-category-buffer)
     (article-copy . gnus-article-copy)
     (info . gnus-info-buffer)
     (category . gnus-category-buffer)
     (article-copy . gnus-article-copy)

-    (draft . gnus-draft-buffer))
+    (draft . gnus-draft-buffer)
+    (mml-preview . mml-preview-buffer))

   "Mapping from short symbols to buffer names or buffer variables.")
 
 (defcustom gnus-configure-windows-hook nil
   "Mapping from short symbols to buffer names or buffer variables.")
 
 (defcustom gnus-configure-windows-hook nil


@@ -308,7 +308,7 @@ See the Gnus manual for an explanation of the syntax used.")
     ;; The SPLIT might be something that is to be evaled to
     ;; return a new SPLIT.
     (while (and (not (assq (car split) gnus-window-to-buffer))
     ;; The SPLIT might be something that is to be evaled to
     ;; return a new SPLIT.
     (while (and (not (assq (car split) gnus-window-to-buffer))

-               (functionp (car split)))
+               (symbolp (car split)) (fboundp (car split)))

       (setq split (eval split)))
     (let* ((type (car split))
           (subs (cddr split))
       (setq split (eval split)))
     (let* ((type (car split))
           (subs (cddr split))


@@ -371,7 +371,7 @@ See the Gnus manual for an explanation of the syntax used.")
          (while subs
            (setq sub (append (pop subs) nil))
            (while (and (not (assq (car sub) gnus-window-to-buffer))
          (while subs
            (setq sub (append (pop subs) nil))
            (while (and (not (assq (car sub) gnus-window-to-buffer))

-                       (functionp (car sub)))
+                       (symbolp (car sub)) (fboundp (car sub)))

              (setq sub (eval sub)))
            (when sub
              (push sub comp-subs)
              (setq sub (eval sub)))
            (when sub
              (push sub comp-subs)


@@ -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
          (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."
 
 (defun gnus-delete-windows-in-gnusey-frames ()
   "Do a `delete-other-windows' in all frames that have Gnus windows."


@@ -510,7 +511,7 @@ should have point."
       ;; The SPLIT might be something that is to be evaled to
       ;; return a new SPLIT.
       (while (and (not (assq (car split) gnus-window-to-buffer))
       ;; The SPLIT might be something that is to be evaled to
       ;; return a new SPLIT.
       (while (and (not (assq (car split) gnus-window-to-buffer))

-                 (functionp (car split)))
+                 (symbolp (car split)) (fboundp (car split)))

        (setq split (eval split)))
 
       (setq type (elt split 0))
        (setq split (eval split)))
 
       (setq type (elt split 0))


@@ -582,5 +583,4 @@ should have point."
 
 (provide 'gnus-win)
 
 
 (provide 'gnus-win)
 

-;;; arch-tag: ccd5a394-2ddf-4397-b8f8-6d80d3e46e2b

 ;;; gnus-win.el ends here
 ;;; gnus-win.el ends here