emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] Changes to emacs/lisp/gnus/gnus-win.el [lexbind]


From: Miles Bader
Subject: [Emacs-diffs] Changes to emacs/lisp/gnus/gnus-win.el [lexbind]
Date: Wed, 15 Sep 2004 20:38:40 -0400

Index: emacs/lisp/gnus/gnus-win.el
diff -c emacs/lisp/gnus/gnus-win.el:1.10.8.3 
emacs/lisp/gnus/gnus-win.el:1.10.8.4
*** emacs/lisp/gnus/gnus-win.el:1.10.8.3        Tue Jul  6 09:23:45 2004
--- emacs/lisp/gnus/gnus-win.el Thu Sep 16 00:12:16 2004
***************
*** 1,5 ****
  ;;; gnus-win.el --- window configuration functions for Gnus
! ;; Copyright (C) 1996, 97, 98, 1999, 2000, 02, 2004
  ;;        Free Software Foundation, Inc.
  
  ;; Author: Lars Magne Ingebrigtsen <address@hidden>
--- 1,5 ----
  ;;; gnus-win.el --- window configuration functions for Gnus
! ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
  ;;        Free Software Foundation, Inc.
  
  ;; Author: Lars Magne Ingebrigtsen <address@hidden>
***************
*** 29,34 ****
--- 29,35 ----
  (eval-when-compile (require 'cl))
  
  (require 'gnus)
+ (require 'gnus-util)
  
  (defgroup gnus-windows nil
    "Window configuration."
***************
*** 57,62 ****
--- 58,70 ----
    :group 'gnus-windows
    :type 'boolean)
  
+ (defcustom gnus-use-frames-on-any-display nil
+   "*If non-nil, frames on all displays will be considered useable by Gnus.
+ When nil, only frames on the same display as the selected frame will be
+ used to display Gnus windows."
+   :group 'gnus-windows
+   :type 'boolean)
+ 
  (defvar gnus-buffer-configuration
    '((group
       (vertical 1.0
***************
*** 68,84 ****
               (if gnus-carpal '(summary-carpal 4))))
      (article
       (cond
-       ((and gnus-use-picons
-           (eq gnus-picons-display-where 'picons))
-        '(frame 1.0
-              (vertical 1.0
-                        (summary 0.25 point)
-                        (if gnus-carpal '(summary-carpal 4))
-                        (article 1.0))
-              (vertical ((height . 5) (width . 15)
-                         (user-position . t)
-                         (left . -1) (top . 1))
-                        (picons 1.0))))
        (gnus-use-trees
         '(vertical 1.0
                  (summary 0.25 point)
--- 76,81 ----
***************
*** 126,132 ****
               (post 1.0 point)))
      (reply
       (vertical 1.0
!              (article-copy 0.5)
               (message 1.0 point)))
      (forward
       (vertical 1.0
--- 123,129 ----
               (post 1.0 point)))
      (reply
       (vertical 1.0
!              (article 0.5)
               (message 1.0 point)))
      (forward
       (vertical 1.0
***************
*** 165,171 ****
      (compose-bounce
       (vertical 1.0
               (article 0.5)
!              (message 1.0 point))))
    "Window configuration for all possible Gnus buffers.
  See the Gnus manual for an explanation of the syntax used.")
  
--- 162,171 ----
      (compose-bounce
       (vertical 1.0
               (article 0.5)
!              (message 1.0 point)))
!     (display-term
!       (vertical 1.0
!               ("*display*" 1.0))))
    "Window configuration for all possible Gnus buffers.
  See the Gnus manual for an explanation of the syntax used.")
  
***************
*** 187,193 ****
      (mail . gnus-message-buffer)
      (post-news . gnus-message-buffer)
      (faq . gnus-faq-buffer)
-     (picons . gnus-picons-buffer-name)
      (tree . gnus-tree-buffer)
      (score-trace . "*Score Trace*")
      (split-trace . "*Split Trace*")
--- 187,192 ----
***************
*** 197,202 ****
--- 196,206 ----
      (draft . gnus-draft-buffer))
    "Mapping from short symbols to buffer names or buffer variables.")
  
+ (defcustom gnus-configure-windows-hook nil
+   "*A hook called when configuring windows."
+   :group 'gnus-windows
+   :type 'hook)
+ 
  ;;; Internal variables.
  
  (defvar gnus-current-window-configuration nil
***************
*** 301,307 ****
      ;; 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))
!               (gnus-functionp (car split)))
        (setq split (eval split)))
      (let* ((type (car split))
           (subs (cddr split))
--- 305,311 ----
      ;; 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)))
        (setq split (eval split)))
      (let* ((type (car split))
           (subs (cddr split))
***************
*** 364,370 ****
          (while subs
            (setq sub (append (pop subs) nil))
            (while (and (not (assq (car sub) gnus-window-to-buffer))
!                       (gnus-functionp (car sub)))
              (setq sub (eval sub)))
            (when sub
              (push sub comp-subs)
--- 368,374 ----
          (while subs
            (setq sub (append (pop subs) nil))
            (while (and (not (assq (car sub) gnus-window-to-buffer))
!                       (functionp (car sub)))
              (setq sub (eval sub)))
            (when sub
              (push sub comp-subs)
***************
*** 447,453 ****
                      ;; This is not a `frame' split, so we ignore the
                      ;; other frames.
                      (delete-other-windows)
!                   ;; This is a `frame' split, so we delete all windows
                    ;; on all frames.
                    (gnus-delete-windows-in-gnusey-frames))
                ;; Just remove some windows.
--- 451,457 ----
                      ;; This is not a `frame' split, so we ignore the
                      ;; other frames.
                      (delete-other-windows)
!                 ;; This is a `frame' split, so we delete all windows
                    ;; on all frames.
                    (gnus-delete-windows-in-gnusey-frames))
                ;; Just remove some windows.
***************
*** 462,467 ****
--- 466,472 ----
              (switch-to-buffer nntp-server-buffer)
            (set-buffer nntp-server-buffer))
          (gnus-configure-frame split)
+         (run-hooks 'gnus-configure-windows-hook)
          (when gnus-window-frame-focus
            (select-frame (window-frame gnus-window-frame-focus))))))))
  
***************
*** 502,508 ****
        ;; 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))
!                 (gnus-functionp (car split)))
        (setq split (eval split)))
  
        (setq type (elt split 0))
--- 507,513 ----
        ;; 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)))
        (setq split (eval split)))
  
        (setq type (elt split 0))
***************
*** 516,522 ****
        (unless buffer
          (error "Invalid buffer type: %s" type))
        (if (and (setq buf (get-buffer (gnus-window-to-buffer-helper buffer)))
!                (setq win (get-buffer-window buf 0)))
            (if (memq 'point split)
                (setq all-visible win))
          (setq all-visible nil)))
--- 521,527 ----
        (unless buffer
          (error "Invalid buffer type: %s" type))
        (if (and (setq buf (get-buffer (gnus-window-to-buffer-helper buffer)))
!                (setq win (gnus-get-buffer-window buf t)))
            (if (memq 'point split)
                (setq all-visible win))
          (setq all-visible nil)))
***************
*** 548,554 ****
        (if (featurep 'xemacs)
            (switch-to-buffer nntp-server-buffer)
          (set-buffer nntp-server-buffer)))
!       (mapcar (lambda (b) (delete-windows-on b t)) bufs))))
  
  (provide 'gnus-win)
  
--- 553,581 ----
        (if (featurep 'xemacs)
            (switch-to-buffer nntp-server-buffer)
          (set-buffer nntp-server-buffer)))
!       (mapcar (lambda (b) (delete-windows-on b t))
!             (delq lowest-buf bufs)))))
! 
! (eval-and-compile
!   (cond
!    ((fboundp 'frames-on-display-list)
!     (defalias 'gnus-frames-on-display-list 'frames-on-display-list))
!    ((and (featurep 'xemacs) (fboundp 'frame-device))
!     (defun gnus-frames-on-display-list ()
!       (apply 'filtered-frame-list 'identity (list (frame-device nil)))))
!    (t
!     (defalias 'gnus-frames-on-display-list 'frame-list))))
! 
! (defun gnus-get-buffer-window (buffer &optional frame)
!   (cond ((and (null gnus-use-frames-on-any-display)
!             (memq frame '(t 0 visible)))
!        (car
!         (let ((frames (gnus-frames-on-display-list)))
!           (gnus-remove-if (lambda (win) (not (memq (window-frame win)
!                                                    frames)))
!                           (get-buffer-window-list buffer nil frame)))))
!       (t
!        (get-buffer-window buffer frame))))
  
  (provide 'gnus-win)
  




reply via email to

[Prev in Thread] Current Thread [Next in Thread]