Mercurial > hg > xemacs-beta
comparison lisp/window-xemacs.el @ 4136:db22824aa020
[xemacs-hg @ 2007-08-22 07:15:24 by michaels]
2007-08-20 Mike Sperber <mike@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.
author | michaels |
---|---|
date | Wed, 22 Aug 2007 07:15:29 +0000 |
parents | b6287dbce5f0 |
children | 2785829fe37c |
comparison
equal
deleted
inserted
replaced
4135:cee641a27bba | 4136:db22824aa020 |
---|---|
276 (if buffer | 276 (if buffer |
277 (progn | 277 (progn |
278 (let ((marker (make-marker))) | 278 (let ((marker (make-marker))) |
279 (set-marker marker (window-start window) buffer) | 279 (set-marker marker (window-start window) buffer) |
280 (setf (saved-window-start-marker saved-window) marker)) | 280 (setf (saved-window-start-marker saved-window) marker)) |
281 (let ((marker (make-marker))) | 281 (if (not (eq buffer (current-buffer))) |
282 (if (eq window (selected-window)) | 282 (let ((marker (make-marker))) |
283 (set-marker marker (point buffer) buffer) | 283 (set-marker marker (window-point window) buffer) |
284 (set-marker marker (window-point window) buffer)) | 284 (setf (saved-window-point-marker saved-window) marker))) |
285 (setf (saved-window-point-marker saved-window) marker)) | |
286 (setf (saved-window-mark-marker saved-window) | 285 (setf (saved-window-mark-marker saved-window) |
287 (copy-marker (mark-marker t buffer))))) | 286 (copy-marker (mark-marker t buffer))))) |
288 saved-window)))) | 287 saved-window)))) |
289 | 288 |
290 (defun set-window-configuration (configuration) | 289 (defun set-window-configuration (configuration) |
415 (set-window-buffer window | 414 (set-window-buffer window |
416 (saved-window-buffer saved-window)) | 415 (saved-window-buffer saved-window)) |
417 (set-window-start window | 416 (set-window-start window |
418 (marker-position (saved-window-start-marker saved-window)) | 417 (marker-position (saved-window-start-marker saved-window)) |
419 t) | 418 t) |
420 (set-window-point window | 419 (if (markerp (saved-window-point-marker saved-window)) |
421 (marker-position (saved-window-point-marker saved-window))) | 420 (set-window-point window |
421 (marker-position (saved-window-point-marker saved-window)))) | |
422 (set-marker (mark-marker t buffer) | 422 (set-marker (mark-marker t buffer) |
423 (marker-position (saved-window-mark-marker saved-window)) | 423 (marker-position (saved-window-mark-marker saved-window)) |
424 buffer) | 424 buffer) |
425 (if (not (eq buffer (window-configuration-current-buffer configuration))) | 425 (if (not (eq buffer (window-configuration-current-buffer configuration))) |
426 (goto-char (window-point window) buffer))))) | 426 (goto-char (window-point window) buffer))))) |