diff src/winslots.h @ 844:047d37eb70d7

[xemacs-hg @ 2002-05-16 13:30:23 by ben] ui fixes for things that were bothering me bytecode.c, editfns.c, lisp.h, lread.c: Fix save-restriction to use markers rather than pseudo-markers (integers representing the amount of text on either side of the region). That way, all inserts are handled correctly, not just those inside old restriction. Add buffer argument to save_restriction_save(). process.c: Clean up very dirty and kludgy code that outputs into a buffer -- use proper unwind protects, etc. font-lock.c: Do save-restriction/widen around the function -- otherwise, incorrect results will ensue when a buffer has been narrowed before a call to e.g. `buffer-syntactic-context' -- something that happens quite often. fileio.c: Look for a handler for make-temp-name. window.c, winslots.h: Try to solve this annoying problem: have two frames displaying the buffer, in different places; in one, temporarily switch away to another buffer and then back -- and you've lost your position; it's reset to the other one in the other frame. My current solution involves window-level caches of buffers and points (also a cache for window-start); when set-window-buffer is called, it looks to see if the buffer was previously visited in the window, and if so, uses the most recent point at that time. (It's a marker, so it handles changes.) #### Note: It could be argued that doing it on the frame level would be better -- e.g. if you visit a buffer temporarily through a grep, and then go back to that buffer, you presumably want the grep's position rather than some previous position provided everything was in the same frame, even though the grep was in another window in the frame. However, doing it on the frame level fails when you have two windows on the same frame. Perhaps we keep both a window and a frame cache, and use the frame cache if there are no other windows on the frame showing the buffer, else the window's cache? This is probably something to be configurable using a specifier. Suggestions please please please? window.c: Clean up a bit code that deals with the annoyance of window-point vs. point. dialog.el: Function to ask a multiple-choice question, automatically choosing a dialog box or minibuffer representation as necessary. Generalized version of yes-or-no-p, y-or-n-p. files.el: Use get-user-response to ask "yes/no/diff" question when recovering. "diff" means that a diff is displayed between the current file and the autosave. (Converts/deconverts escape-quoted as necessary. No more complaints from you, Mr. Turnbull!) One known problem: when a dialog is used, it's modal, so you can't scroll the diff. Will fix soon. lisp-mode.el: If we're filling a string, don't treat semicolon as a comment, which would give very unfriendly results. Uses `buffer-syntactic-context'. simple.el: all changes back to the beginning. (Useful if you've saved the file in the middle of the changes.) simple.el: Add option kill-word-into-kill-ring, which controls whether words deleted with kill-word, backward-kill-word, etc. are "cut" into the kill ring, or "cleared" into nothingness. (My preference is the latter, by far. I'd almost go so far as suggesting we make it the default, as you can always select a word and then cut it if you want it cut.) menubar-items.el: Add option corresponding to kill-word-into-kill-ring.
author ben
date Thu, 16 May 2002 13:30:58 +0000
parents 8ae895c67ce7
children e22b0213b713
line wrap: on
line diff
--- a/src/winslots.h	Wed May 15 15:27:58 2002 +0000
+++ b/src/winslots.h	Thu May 16 13:30:58 2002 +0000
@@ -1,7 +1,7 @@
 /* Definitions of marked slots in windows and window configs
    Copyright (C) 1985, 1986, 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
    Copyright (C) 1994, 1995 Board of Trustees, University of Illinois.
-   Copyright (C) 1995, 1996, 2001 Ben Wing.
+   Copyright (C) 1995, 1996, 2001, 2002 Ben Wing.
    Copyright (C) 1996 Chuck Thompson.
 
 This file is part of XEmacs.
@@ -28,7 +28,9 @@
 
    NOTE: No semicolons after slot declarations in this file!  The
    definitions of WINDOW_SLOT (and possibly WINDOW_SAVED_SLOT) need
-   to include a semicolon.
+   to include a semicolon.  This is because these may be defined as
+   nothing, and some compilers don't tolerate extra semicolons in
+   structure definitions.
 
    WINDOW_SLOT declares a Lisp_Object that is not copied into the
      saved_window struct of a window configuration, or is handled in
@@ -110,6 +112,20 @@
   /* A marker pointing to where in the text the scrollbar is pointing;
      #### moved to scrollbar.c? */
   WINDOW_SLOT (sb_point)
+  /* A table that remembers (in marker form) the value of point in buffers
+     previously displayed in this window.  Switching back to those buffers
+     causes the remembered point value to become current, rather than the
+     buffer's point.  This is so that you get sensible behavior if you have
+     a buffer displayed in multiple windows and temporarily switch away and
+     then back in one window.  We don't save or restore this table in a
+     window configuration, since that would be counterproductive -- we
+     always want to remember the most recent value of point in buffers we
+     switched away from. */
+  WINDOW_SLOT (saved_point_cache)
+  /* A table that remembers (in marker form) the value of window start in
+     buffers previously displayed in this window.  Save reason as for
+     the previous table. */
+  WINDOW_SLOT (saved_last_window_start_cache)
 
   /* Number saying how recently window was selected */
   WINDOW_SLOT (use_time)