[ECB-list] window configurations no longer (since 21.5) include

[Henry S. Thompson]

Here's the patch for ecb which, when added to the xemacs-21.5 patch I
sent earlier, will get ecb working under 21.5 (and should do no harm
wrt previous versions/emacs).

ht

-------------- next part --------------
Index: ecb-layout.el
===================================================================
RCS file: /cvsroot/ecb/ecb/ecb-layout.el,v
retrieving revision 1.257
diff -b -w -C3 -r1.257 ecb-layout.el
*** ecb-layout.el	8 Jul 2007 16:42:05 -0000	1.257
--- ecb-layout.el	16 Mar 2008 14:33:15 -0000
***************
*** 1565,1570 ****
--- 1565,1579 ----
       ;; `ecb-enlarged-compilation-window-max-height'
       (ecb-set-compile-window-height)))
        
+ 
+  ;; if set-window-configuration changes the values of ecb-edit-window or ecb-compile-window, fix them
+  (defadvice set-window-configuration/mapping (after hack activate)
+    (let ((edit-window-changed (assq ecb-edit-window ad-return-value))
+ 	 (compile-window-changed (assq ecb-compile-window ad-return-value)))
+      (if edit-window-changed
+ 	 (setq ecb-edit-window (cdr edit-window-changed)))
+      (if compile-window-changed
+ 	 (setq ecb-compile-window (cdr compile-window-changed)))))
   ) ;; end of if-ecb-running-xemacs
  
  (when-ecb-running-emacs
Index: ecb-util.el
===================================================================
RCS file: /cvsroot/ecb/ecb/ecb-util.el,v
retrieving revision 1.139
diff -b -w -C3 -r1.139 ecb-util.el
*** ecb-util.el	8 Jul 2007 16:42:04 -0000	1.139
--- ecb-util.el	16 Mar 2008 14:33:26 -0000
***************
*** 1844,1852 ****
            (error "Window must be on frame."))
        (let ((current-frame (selected-frame))
              (current-point (point))
              list)
          (unwind-protect
!             (save-window-excursion
                (select-frame frame)
                ;; this is needed for correct start-point
                (select-window window)
--- 1844,1853 ----
            (error "Window must be on frame."))
        (let ((current-frame (selected-frame))
              (current-point (point))
+ 	    (current-window (selected-window))
              list)
          (unwind-protect
!             (progn ;save-window-excursion
                (select-frame frame)
                ;; this is needed for correct start-point
                (select-window window)
***************
*** 1861,1866 ****
--- 1862,1868 ----
                (setq list (nreverse list))
                (setq list (cons window list)))
            (select-frame current-frame)
+ 	  (select-window current-window)
            ;; we must reset the point of the buffer which was current at call-time
            ;; of this function
            (goto-char current-point))))))
-------------- next part --------------

-- 
 Henry S. Thompson, HCRC Language Technology Group, University of Edinburgh
                     Half-time member of W3C Team
    2 Buccleuch Place, Edinburgh EH8 9LW, SCOTLAND -- (44) 131 650-4440
            Fax: (44) 131 650-4587, e-mail: ht at inf.ed.ac.uk
                   URL: http://www.ltg.ed.ac.uk/~ht/
[mail really from me _always_ has this .sig -- mail without it is forged spam]