xemacs-beta: lisp/vm/vm-window.el comparison

comparison lisp/vm/vm-window.el @ 155:43dd3413c7c7 r20-3b4

Import from CVS: tag r20-3b4

author	cvs
date	Mon, 13 Aug 2007 09:39:39 +0200
parents	585fb297b004
children	2d532a89d707

comparison

equal deleted inserted replaced

-:94141801dd7e
+:43dd3413c7c7
 	 (vm-select-frame wf))
 (cond ((and buffer display)
 	    (if (and vm-display-buffer-hook
 		     (null (vm-get-visible-buffer-window buffer)))
 		(progn (run-hooks 'vm-display-buffer-hook)
-		       (switch-to-buffer buffer)
+		       (switch-to-buffer buffer))
-		       (vm-record-current-window-configuration nil))
 	      (if (not (and (memq this-command commands)
 			    (apply 'vm-set-window-configuration configs)
 			    (vm-get-visible-buffer-window buffer)))
 		  (vm-display-buffer buffer))))
 	   ((and buffer (not display))
 	    (if (and vm-undisplay-buffer-hook
 		     (vm-get-visible-buffer-window buffer))
 		(progn (set-buffer buffer)
-		       (run-hooks 'vm-undisplay-buffer-hook)
+		       (run-hooks 'vm-undisplay-buffer-hook))
-		       (vm-record-current-window-configuration nil))
 	      (if (not (and (memq this-command commands)
 			    (apply 'vm-set-window-configuration configs)))
 		  (vm-undisplay-buffer buffer))))
 	   ((memq this-command commands)
 	    (apply 'vm-set-window-configuration configs))))))
 (defun vm-display-buffer (buffer)
 (let ((pop-up-windows (eq vm-mutable-windows t))
-	(pop-up-frames vm-mutable-frames))
+	(pop-up-frames (and pop-up-frames vm-mutable-frames)))
-(vm-record-current-window-configuration nil)
 (if (or pop-up-frames
 	    (and (eq vm-mutable-windows t)
 		 (symbolp
 		  (vm-buffer-to-label
 		   (window-buffer
 	(select-window (display-buffer buffer))
 (switch-to-buffer buffer))))
 (defun vm-undisplay-buffer (buffer)
 (vm-save-buffer-excursion
-(vm-delete-windows-or-frames-on buffer)
+(vm-maybe-delete-windows-or-frames-on buffer)
 (let ((w (vm-get-buffer-window buffer)))
 (and w (set-window-buffer w (other-buffer))))))
 (defun vm-load-window-configurations (file)
 (save-excursion
 	    (t (throw 'done nil)))
 (set-buffer message)
 (vm-check-for-killed-presentation)
 (if vm-presentation-buffer
 	  (setq message vm-presentation-buffer))
-;; if this configuration is already the current one, don't
-;; set it up again.
-(if (or (and vm-mutable-frames (eq (car config) vm-window-configuration))
-	      (and (not vm-mutable-frames)
-		   (listp vm-window-configuration)
-		   (eq (car config)
-		       (cdr (assq selected-frame vm-window-configuration)))))
-	  (throw 'done nil))
 (vm-check-for-killed-summary)
 (or summary (setq summary (or vm-summary-buffer nonexistent-summary)))
 (or composition (setq composition nonexistent))
 (or edit (setq edit nonexistent))
 (tapestry-replace-tapestry-element (nth 1 config) 'buffer-name
 					    (if (symbolp x)
 						(symbol-value x)
 					      x ))))
 (set-tapestry (nth 1 config) 1)
 (and (get-buffer nonexistent)
-	   (vm-delete-windows-or-frames-on nonexistent))
+	   (vm-maybe-delete-windows-or-frames-on nonexistent))
 (if (and (vm-get-buffer-window nonexistent-summary)
 	       (not (vm-get-buffer-window message)))
 	  ;; user asked for summary to be displayed but doesn't
 	  ;; have one, nor is the folder buffer displayed.  Help
 	  ;; the user not to lose here.
 	  (vm-replace-buffer-in-windows nonexistent-summary message)
 	(and (get-buffer nonexistent-summary)
-	     (vm-delete-windows-or-frames-on nonexistent-summary)))
+	     (vm-maybe-delete-windows-or-frames-on nonexistent-summary))) )))
-(vm-record-current-window-configuration config)
-config )))
-(defun vm-record-current-window-configuration (config)
-;; this function continues to be a no-op.
-;;
-;; the idea behind this function is that VM can remember what
-;; the current window configuration is and not rebuild the
-;; configuration for the next command if it matches what we
-;; have recorded.
-;;
-;; the problem with this idea is that the user can do things
-;; like C-x 0 and VM has no way of knowing.  So VM thinks the
-;; right configuration is displayed when in fact it is not,
-;; which can cause incorrect displays.
-'(let (cell)
-(if (and (listp vm-window-configuration)
-	     (setq cell (assq (vm-selected-frame) vm-window-configuration)))
-	(setcdr cell (car config))
-(setq vm-window-configuration
-	    (cons
-	     (cons (vm-selected-frame) (car config))
-	     vm-window-configuration)))))
 (defun vm-save-window-configuration (tag)
 "Name and save the current window configuration.
 With this command you associate the current window setup with an
 action.  Each time you perform this action VM will duplicate this
 specific configurations are searched for first, then the category
 configurations and then the default configuration.  The first
 configuration found is the one that is applied.
 The value of vm-mutable-windows must be non-nil for VM to use
-window configurations.
+window configurations."
-If vm-mutable-frames is non-nil and Emacs is running under X
-windows, then VM will use all existing frames.  Otherwise VM will
-restrict its changes to the frame in which it was started."
 (interactive
 (let ((last-command last-command)
 	 (this-command this-command))
 (if (null vm-window-configuration-file)
 	 (error "Configurable windows not enabled.  Set vm-window-configuration-file to enable."))
 	(vm-iconify-frame-xxx))))
 (defun vm-window-loop (action obj-1 &optional obj-2)
 (let ((delete-me nil)
 	(done nil)
-	(all-frames (if vm-mutable-frames t nil))
+	(all-frames (if vm-search-other-frames t nil))
 	start w)
 (setq start (next-window (selected-window) 'nomini all-frames)
 	  w start)
 (and obj-1 (setq obj-1 (get-buffer obj-1)))
 (while (not done)
 	(if delete-me
 	    (progn
 	      (vm-error-free-call 'vm-delete-frame delete-me)
 	      (setq delete-me nil))))))
-(defun vm-delete-windows-or-frames-on (buffer)
+(defun vm-maybe-delete-windows-or-frames-on (buffer)
 (and (eq vm-mutable-windows t) (vm-window-loop 'delete buffer))
 (and vm-mutable-frames (vm-frame-loop 'delete buffer)))
 (defun vm-replace-buffer-in-windows (old new)
 (vm-window-loop 'replace old new))
 	       (b (current-buffer))
 	       (wf (and w (vm-window-frame w))))
 	  (and w (eq (vm-selected-frame) wf) (vm-created-this-frame-p wf)
 	       (vm-error-free-call 'vm-delete-frame wf))
 	  (and w (let ((vm-mutable-frames t))
-		   (vm-delete-windows-or-frames-on b)))))))
+		   (vm-maybe-delete-windows-or-frames-on b)))))))
 (defun vm-register-frame (frame)
 (setq vm-frame-list (cons frame vm-frame-list)))
 (defun vm-goto-new-frame (&rest types)
 (vm-register-frame (vm-selected-frame))
 (and vm-warp-mouse-to-new-frame
 	 (vm-warp-mouse-to-frame-maybe (vm-selected-frame)))))
 (defun vm-goto-new-summary-frame-maybe ()
-(if (and vm-frame-per-summary (vm-multiple-frames-possible-p))
+(if (and vm-mutable-frames vm-frame-per-summary
+	   (vm-multiple-frames-possible-p))
 (let ((w (vm-get-buffer-window vm-summary-buffer)))
 	(if (null w)
 	    (progn
 	      (vm-goto-new-frame 'summary)
 	      (vm-set-hooks-for-frame-deletion))
 	    (select-window w)
 	    (and vm-warp-mouse-to-new-frame
 		 (vm-warp-mouse-to-frame-maybe (vm-window-frame w))))))))
 (defun vm-goto-new-folder-frame-maybe (&rest types)
-(if (and vm-frame-per-folder (vm-multiple-frames-possible-p))
+(if (and vm-mutable-frames vm-frame-per-folder
+	   (vm-multiple-frames-possible-p))
 (let ((w (or (vm-get-buffer-window (current-buffer))
 		   ;; summary == folder for the purpose
 		   ;; of frame reuse.
 		   (and vm-summary-buffer
 			(vm-get-buffer-window vm-summary-buffer))
 	    (and vm-warp-mouse-to-new-frame
 		 (vm-warp-mouse-to-frame-maybe (vm-window-frame w))))))))
 (defun vm-warp-mouse-to-frame-maybe (&optional frame)
 (or frame (setq frame (vm-selected-frame)))
-(if (vm-mouse-support-possible-p)
+(if (vm-mouse-support-possible-here-p)
 (cond ((vm-mouse-xemacs-mouse-p)
 	     (cond ((fboundp 'mouse-position);; XEmacs 19.12
 		    (let ((mp (mouse-position)))
 		      (if (and (car mp)
 			       (eq (window-frame (car mp)) (selected-frame)))

Mercurial > hg > xemacs-beta

comparison lisp/vm/vm-window.el @ 155:43dd3413c7c7 r20-3b4