Commit 502b9b64 authored by Jim Blandy's avatar Jim Blandy

entered into RCS

parent 1cbd5d9d
......@@ -24,9 +24,9 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#ifndef standalone
#include "buffer.h"
#include "window.h"
#ifdef MULTI_SCREEN
#include "screen.h"
#endif /* MULTI_SCREEN */
#ifdef MULTI_FRAME
#include "frame.h"
#endif /* MULTI_FRAME */
#endif
#include "syssignal.h"
......@@ -68,9 +68,9 @@ extern
#endif /* VIRT_ADDR_VARIES */
int malloc_sbrk_unused;
/* Two thresholds controlling how much undo information to keep. */
int undo_threshold;
int undo_high_threshold;
/* Two limits controlling how much undo information to keep. */
int undo_limit;
int undo_strong_limit;
/* Non-nil means defun should do purecopy on the function definition */
Lisp_Object Vpurify_flag;
......@@ -1090,8 +1090,8 @@ Garbage collection happens automatically if you cons more than\n\
So don't call truncate_undo_list if undo_list is Qt. */
if (! EQ (nextb->undo_list, Qt))
nextb->undo_list
= truncate_undo_list (nextb->undo_list, undo_threshold,
undo_high_threshold);
= truncate_undo_list (nextb->undo_list, undo_limit,
undo_strong_limit);
nextb = nextb->next;
}
}
......@@ -1344,10 +1344,10 @@ mark_object (objptr)
}
break;
#ifdef MULTI_SCREEN
case Lisp_Screen:
#ifdef MULTI_FRAME
case Lisp_Frame:
{
register struct screen *ptr = XSCREEN (obj);
register struct frame *ptr = XFRAME (obj);
register int size = ptr->size;
register int i;
......@@ -1355,7 +1355,7 @@ mark_object (objptr)
ptr->size |= ARRAY_MARK_FLAG; /* Else mark it */
mark_object (&ptr->name);
mark_object (&ptr->focus_screen);
mark_object (&ptr->focus_frame);
mark_object (&ptr->width);
mark_object (&ptr->height);
mark_object (&ptr->selected_window);
......@@ -1363,7 +1363,7 @@ mark_object (objptr)
mark_object (&ptr->param_alist);
}
break;
#endif /* MULTI_SCREEN */
#endif /* MULTI_FRAME */
#if 0
case Lisp_Temp_Vector:
......@@ -1900,20 +1900,20 @@ prevent garbage collection during a part of the program.");
"Non-nil means loading Lisp code in order to dump an executable.\n\
This means that certain objects should be allocated in shared (pure) space.");
DEFVAR_INT ("undo-threshold", &undo_threshold,
DEFVAR_INT ("undo-limit", &undo_limit,
"Keep no more undo information once it exceeds this size.\n\
This threshold is applied when garbage collection happens.\n\
This limit is applied when garbage collection happens.\n\
The size is counted as the number of bytes occupied,\n\
which includes both saved text and other data.");
undo_threshold = 20000;
undo_limit = 20000;
DEFVAR_INT ("undo-high-threshold", &undo_high_threshold,
DEFVAR_INT ("undo-strong-limit", &undo_strong_limit,
"Don't keep more than this much size of undo information.\n\
A command which pushes past this size is itself forgotten.\n\
This threshold is applied when garbage collection happens.\n\
This limit is applied when garbage collection happens.\n\
The size is counted as the number of bytes occupied,\n\
which includes both saved text and other data.");
undo_high_threshold = 30000;
undo_strong_limit = 30000;
defsubr (&Scons);
defsubr (&Slist);
......
......@@ -1455,7 +1455,7 @@ Automatically becomes buffer-local when set in any fashion.\n\
\n\
Note that this is overridden by the variable\n\
`truncate-partial-width-windows' if that variable is non-nil\n\
and this buffer is not full-screen width.");
and this buffer is not full-frame width.");
DEFVAR_PER_BUFFER ("default-directory", &current_buffer->directory,
"Name of default directory of current buffer. Should end with slash.\n\
......
......@@ -18,8 +18,8 @@ along with GNU Emacs; see the file COPYING. If not, write to
the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
/* Nonzero means don't assume anything about current
contents of actual terminal screen */
extern int screen_garbaged;
contents of actual terminal frame */
extern int frame_garbaged;
/* Nonzero means last display completed and cursor is really at
cursX, cursY. Zero means it was preempted. */
......@@ -34,32 +34,32 @@ struct run
};
#endif
/* This structure is used for the actual display of text on a screen.
/* This structure is used for the actual display of text on a frame.
There are two instantiations of it: the glyphs currently displayed,
and the glyphs we desire to display. The latter object is generated
from buffers being displayed. */
struct screen_glyphs
struct frame_glyphs
{
#ifdef MULTI_SCREEN
struct screen *screen; /* Screen these glyphs belong to. */
#endif /* MULTI_SCREEN */
#ifdef MULTI_FRAME
struct frame *frame; /* Frame these glyphs belong to. */
#endif /* MULTI_FRAME */
int height;
int width;
/* Contents of the screen.
/* Contents of the frame.
glyphs[V][H] is the glyph at position V, H.
Note that glyphs[V][-1],
glyphs[V][used[V]],
and glyphs[V][screen_width] are always '\0'. */
and glyphs[V][frame_width] are always '\0'. */
GLYPH **glyphs;
/* long vector from which the strings in `glyphs' are taken. */
GLYPH *total_contents;
/* When representing a desired screen,
enable[n] == 0 means that line n is same as current screen.
When representing current screen contents,
/* When representing a desired frame,
enable[n] == 0 means that line n is same as current frame.
When representing current frame contents,
enable[n] == 0 means that line n is blank. */
char *enable;
......@@ -90,6 +90,6 @@ struct screen_glyphs
#define LINE_HEIGHT(s,n) (FONT_HEIGHT((s)->display.x->font))
#define LINE_WIDTH(s,n) (FONT_HEIGHT((s)->display.x->font) \
* SCREEN_CURRENT_GLYPHS(s)->enable[(n)])
* FRAME_CURRENT_GLYPHS(s)->enable[(n)])
extern void get_display_line ();
This diff is collapsed.
......@@ -22,7 +22,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#include "lisp.h"
#include "buffer.h"
#include "indent.h"
#include "screen.h"
#include "frame.h"
#include "window.h"
#include "termchar.h"
#include "termopts.h"
......@@ -70,8 +70,8 @@ This is calculated by adding together the widths of all the displayed\n\
representations of the character between the start of the previous line\n\
and point. (eg control characters will have a width of 2 or 4, tabs\n\
will have a variable width)\n\
Ignores finite width of screen, which means that this function may return\n\
values greater than (screen-width).\n\
Ignores finite width of frame, which means that this function may return\n\
values greater than (frame-width).\n\
Whether the line is visible (if `selective-display' is t) has no effect;\n\
however, ^M is treated as end of line when `selective-display' is t.")
()
......@@ -395,12 +395,12 @@ struct position val_compute_motion;
When displaying in window w, a typical formula for WIDTH is:
window_width - 1
- (window_width + window_left != screen_width)
- (window_width + window_left != frame_width)
where
window_width is XFASTINT (w->width),
window_left is XFASTINT (w->left),
and screen_width = SCREEN_WIDTH (XSCREEN (window->screen))
and frame_width = FRAME_WIDTH (XFRAME (window->frame))
This accounts for the continuation-line backslashes, and the window
borders if the window is split vertically. */
......@@ -513,7 +513,7 @@ compute_motion (from, fromvpos, fromhpos, to, tovpos, tohpos, width, hscroll, ta
break;
if (hscroll
|| (truncate_partial_width_windows
&& width + 1 < SCREEN_WIDTH (selected_screen))
&& width + 1 < FRAME_WIDTH (selected_frame))
|| !NILP (current_buffer->truncate_lines))
{
/* Truncating: skip to newline. */
......@@ -561,7 +561,7 @@ pos_tab_offset (w, pos)
int col;
int width = XFASTINT (w->width) - 1
- (XFASTINT (w->width) + XFASTINT (w->left)
!= SCREEN_WIDTH (XSCREEN (w->screen)));
!= FRAME_WIDTH (XFRAME (w->frame)));
if (pos == BEGV || FETCH_CHAR (pos - 1) == '\n')
return 0;
......@@ -678,7 +678,7 @@ Returns number of lines moved; may be closer to zero than LINES\n\
register struct window *w = XWINDOW (selected_window);
int width = XFASTINT (w->width) - 1
- (XFASTINT (w->width) + XFASTINT (w->left)
!= SCREEN_WIDTH (XSCREEN (w->screen)));
!= FRAME_WIDTH (XFRAME (w->frame)));
CHECK_NUMBER (lines, 0);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment