CVS update by michaels xemacs/lisp ...

[xemacs-cvs at xemacs.org]

  User: michaels
  Date: 07/08/22 09:15:38

  Modified:    xemacs/lisp ChangeLog window-xemacs.el
Log:
2007-08-20  Mike Sperber  <mike at xemacs.org>

	* window-xemacs.el (root-window->saved-window):
	(restore-saved-window-parameters): Don't save the point of the
	current buffer, as per the docstring.

Revision  Changes    Path
1.832     +6 -0      XEmacs/xemacs/lisp/ChangeLog

Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/ChangeLog,v
retrieving revision 1.831
retrieving revision 1.832
diff -u -p -r1.831 -r1.832
--- ChangeLog	2007/08/21 12:38:57	1.831
+++ ChangeLog	2007/08/22 07:15:24	1.832
@@ -1,3 +1,9 @@
+2007-08-20  Mike Sperber  <mike at xemacs.org>
+
+	* window-xemacs.el (root-window->saved-window): 
+	(restore-saved-window-parameters): Don't save the point of the
+	current buffer, as per the docstring.
+
 2007-08-21  Aidan Kehoe  <kehoea at parhasard.net>
 
 	* mule/vietnamese.el ("Vietnamese"): Remove vscii and viqr from



1.26      +7 -7      XEmacs/xemacs/lisp/window-xemacs.el

Index: window-xemacs.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/window-xemacs.el,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- window-xemacs.el	2006/10/31 09:16:29	1.25
+++ window-xemacs.el	2007/08/22 07:15:29	1.26
@@ -278,11 +278,10 @@ its value is -not- saved."
 	      (let ((marker (make-marker)))
 		(set-marker marker (window-start window) buffer)
 		(setf (saved-window-start-marker saved-window) marker))
-	      (let ((marker (make-marker)))
-		(if (eq window (selected-window))
-		    (set-marker marker (point buffer) buffer)
-		  (set-marker marker (window-point window) buffer))
-		(setf (saved-window-point-marker saved-window) marker))
+	      (if (not (eq buffer (current-buffer)))
+		  (let ((marker (make-marker)))
+		    (set-marker marker (window-point window) buffer)
+		    (setf (saved-window-point-marker saved-window) marker)))
 	      (setf (saved-window-mark-marker saved-window)
 		    (copy-marker (mark-marker t buffer)))))
 	saved-window))))
@@ -417,8 +416,9 @@ by `current-window-configuration'."
 	  (set-window-start window
 			    (marker-position (saved-window-start-marker saved-window))
 			    t)
-	  (set-window-point window
-			    (marker-position (saved-window-point-marker saved-window)))
+	  (if (markerp (saved-window-point-marker saved-window))
+	      (set-window-point window
+				(marker-position (saved-window-point-marker saved-window))))
 	  (set-marker (mark-marker t buffer)
 		      (marker-position (saved-window-mark-marker saved-window))
 		      buffer)