aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2004-02-21 13:22:31 +0000
committerEli Zaretskii2004-02-21 13:22:31 +0000
commit32e51983e963d817807fb0d95dc0ee4269d70bfb (patch)
tree2b8fcfdcc032991143c7c968503a32e5e406ebd3
parent5c4e49416a616f1d64d51ba7ed8d67bf10565283 (diff)
downloademacs-32e51983e963d817807fb0d95dc0ee4269d70bfb.tar.gz
emacs-32e51983e963d817807fb0d95dc0ee4269d70bfb.zip
Remove table of command line arguments from the Commentary section.
Diffstat
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/startup.el98
2 files changed, 8 insertions, 95 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7a1f7e0ec17..2d0afcdfe28 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12004-02-21 Juri Linkov <juri@jurta.org>
2
3 * startup.el: Remove table of command line arguments from the
4 Commentary section.
5
12004-02-20 John Wiegley <johnw@newartisans.com> 62004-02-20 John Wiegley <johnw@newartisans.com>
2 7
3 * eshell/em-pred.el (eshell-modifier-alist): Changed the "eval 8 * eshell/em-pred.el (eshell-modifier-alist): Changed the "eval
diff --git a/lisp/startup.el b/lisp/startup.el
index 2808689eaeb..26671e50014 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -25,101 +25,9 @@
25 25
26;;; Commentary: 26;;; Commentary:
27 27
28;; This file parses the command line and gets Emacs running. Options on 28;; This file parses the command line and gets Emacs running. Options
29;; the command line are handled in precedence order. The order is the 29;; on the command line are handled in precedence order. For priorities
30;; one in the list below; first described means first handled. Options 30;; see the structure standard_args in the emacs.c file.
31;; within each category (delimited by a bar) are handled in the order
32;; encountered on the command line.
33
34;; -------------------------
35;; -version Print Emacs version to stderr, then exit
36;; --version successfully right away.
37;; This option is handled by emacs.c
38;; -------------------------
39;; -help Print a short usage description and exit
40;; --help successfully right away.
41;; This option is handled by emacs.c
42;; -------------------------
43;; -nl Do not use shared memory (for systems that
44;; -no-shared-memory support this) for the dumped Emacs data.
45;; This option is handled by emacs.c
46;;
47;; -map For VMS.
48;; --map-data This option is handled by emacs.c
49;; -------------------------
50;; -t FILE Use FILE as the name of the terminal.
51;; --terminal FILE Using this implies "-nw" also.
52;; This option is handled by emacs.c
53;; -------------------------
54;; -d DISPNAME Use DISPNAME as the name of the X
55;; -display DISPNAME display for the initial frame.
56;; --display DISPNAME This option is handled by emacs.c
57;; -------------------------
58;; -nw Do not use a windows system (but use the
59;; --no-window-system terminal instead.)
60;; This option is handled by emacs.c
61;; -------------------------
62;; -batch Execute noninteractively (messages go to stdout,
63;; --batch variable noninteractive set to t)
64;; This option is handled by emacs.c
65;; -------------------------
66;; -q Do not load user's init file and do not load
67;; -no-init-file "default.el". Regardless of this switch,
68;; --no-init-file "site-start" is still loaded.
69;; -------------------------
70;; -no-site-file Do not load "site-start.el". (This is the ONLY
71;; --no-site-file way to prevent loading that file.)
72;; -------------------------
73;; -no-splash Don't display a splash screen on startup.
74;; --no-splash
75;; -------------------------
76;; -u USER Load USER's init file instead of the init
77;; -user USER file belonging to the user starting Emacs.
78;; --user USER
79;; -------------------------
80;; -debug-init Don't catch errors in init files; let the
81;; --debug-init debugger run.
82;; -------------------------
83;; -i ICONTYPE Set type of icon using when Emacs is
84;; -itype ICONTYPE iconified under X.
85;; --icon-type ICONTYPE This option is passed on to term/x-win.el
86;;
87;; -iconic Start Emacs iconified.
88;; --iconic This option is passed on to term/x-win.el
89;; -------------------------
90;; Various X options for colors/fonts/geometry/title etc.
91;; These options are passed on to term/x-win.el which see.
92;; -------------------------
93;; FILE Visit FILE.
94;; -visit FILE
95;; --visit FILE
96;; -file FILE
97;; --file FILE
98;;
99;; -L DIRNAME Add DIRNAME to load-path
100;; -directory DIRNAME
101;; --directory DIRNAME
102;;
103;; -l FILE Load and execute the Emacs lisp code
104;; -load FILE in FILE.
105;; --load FILE
106;;
107;; -f FUNC Execute Emacs lisp function FUNC with
108;; -funcall FUNC no arguments. The "-e" form is outdated
109;; --funcall FUNC and should not be used. (It's a typo
110;; -e FUNC promoted to a feature.)
111;;
112;; -eval FORM Execute Emacs lisp form FORM.
113;; --eval FORM
114;; -execute EXPR
115;; --execute EXPR
116;;
117;; -insert FILE Insert the contents of FILE into buffer.
118;; --insert FILE
119;; -------------------------
120;; -kill Kill (exit) Emacs right away.
121;; --kill
122;; -------------------------
123 31
124;;; Code: 32;;; Code:
125 33
generated by cgit v1.2.1 (git 2.18.0) at 2026-01-23 12:49:23 +0000