Commit 6e910e07 authored by Richard M. Stallman's avatar Richard M. Stallman

(main): Handle --script.

(USAGE1): Mention --script.
(standard_args): Define sort order for --script.
parent 0a1c83e7
2002-08-27 Richard M. Stallman <rms@gnu.org>
* xfns.c (x_set_cursor_type): Set FRAME_BLINK_OFF_CURSOR and
FRAME_BLINK_OFF_CURSOR_WIDTH using defaults and Vblink_cursor_alist.
(Vblink_cursor_alist): New variable.
(syms_of_xfns): Initialize and defvar it.
(x_specified_cursor_type): Recognize Qbox for filled box.
Exceptions are hollow boxes.
(Qbox, Qhollow): New variables.
(syms_of_xfns): Initialize and staticpro them.
* xterm.h (FRAME_BLINK_OFF_CURSOR, FRAME_BLINK_OFF_CURSOR_WIDTH):
New macros.
(struct x_output): New fields blink_off_cursor, blink_off_cursor_width.
* xterm.c (x_display_and_set_cursor): Use FRAME_BLINK_OFF_CURSOR
and FRAME_BLINK_OFF_CURSOR_WIDTH for blinking cursor off.
* emacs.c (main): Handle --script.
(USAGE1): Mention --script.
(standard_args): Define sort order for --script.
2002-08-27 Gerd Moellmann <gerd.moellmann@t-online.de>
* xdisp.c (redisplay_updating_p): Variable removed.
(inhibit_free_realized_faces, Qinhibit_free_realized_faces): New
variables.
(init_iterator): Don't free realized faces if
inhibit_free_realized_faces is set.
(redisplay_internal): Bind Qinhibit_free_realized_faces to nil.
(syms_of_xdisp): DEFVAR_BOOL inhibit-free-realized-faces,
initialize Qinhibit_free_realized_faces.
* dispextern.h (PRODUCE_GLYPHS): Set inhibit_free_realized_faces
when iterator is adding glyphs to a glyph matrix.
2002-08-27 Kenichi Handa <handa@etl.go.jp>
* xdisp.c (get_next_display_element): In unibyte case, don't use
......
......@@ -228,6 +228,7 @@ read the main documentation for these command-line arguments.\n\
Initialization options:\n\
\n\
--batch do not do interactive display; implies -q\n\
--script FILE run FILE as an Emacs Lisp script.
--debug-init enable Emacs Lisp debugger during init file\n\
--help display this help message and exit\n\
--multibyte, --no-unibyte run Emacs in multibyte mode\n\
......@@ -779,6 +780,7 @@ main (argc, argv, envp)
struct rlimit rlim;
#endif
int no_loadup = 0;
char *junk = 0;
#if GC_MARK_STACK
extern Lisp_Object *stack_base;
......@@ -1033,6 +1035,15 @@ main (argc, argv, envp)
noninteractive = 0;
if (argmatch (argv, argc, "-batch", "--batch", 5, NULL, &skip_args))
noninteractive = 1;
if (argmatch (argv, argc, "-script", "--script", 3, &junk, &skip_args))
{
noninteractive = 1; /* Set batch mode. */
/* Convert --script to -l, un-skip it, and sort again so that -l will be
handled in proper sequence. */
argv[skip_args - 1] = "-l";
skip_args -= 2;
sort_args (argc, argv);
}
/* Handle the --help option, which gives a usage message. */
if (argmatch (argv, argc, "-help", "--help", 3, NULL, &skip_args))
......@@ -1658,6 +1669,7 @@ struct standard_args standard_args[] =
{ "-nw", "--no-window-system", 110, 0 },
{ "-nw", "--no-windows", 110, 0 },
{ "-batch", "--batch", 100, 0 },
{ "-script", "--script", 100, 1 },
{ "-help", "--help", 90, 0 },
{ "-no-unibyte", "--no-unibyte", 83, 0 },
{ "-multibyte", "--multibyte", 82, 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