aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGerd Moellmann1999-10-26 14:34:42 +0000
committerGerd Moellmann1999-10-26 14:34:42 +0000
commit67a5596fa3e72172a0deeca74e2087f174a456e8 (patch)
tree2eac31159316723e5384b7dd5c2122bef596c900 /src
parent7f785b50454e9750b2612c8a5463900e3846878d (diff)
downloademacs-67a5596fa3e72172a0deeca74e2087f174a456e8.tar.gz
emacs-67a5596fa3e72172a0deeca74e2087f174a456e8.zip
(standard_args): Add `file' as synonym for `visit',
`execute' as synonym for `eval'. (main): Add new options to usage message.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog6
-rw-r--r--src/emacs.c8
2 files changed, 13 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 7fea62d2ae5..cdd2940d0a7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
11999-10-26 Gerd Moellmann <gerd@gnu.org>
2
3 * emacs.c (standard_args): Add `file' as synonym for `visit',
4 `execute' as synonym for `eval'.
5 (main): Add new options to usage message.
6
11999-10-25 Gerd Moellmann <gerd@gnu.org> 71999-10-25 Gerd Moellmann <gerd@gnu.org>
2 8
3 * data.c (Qhash_table): New. 9 * data.c (Qhash_table): New.
diff --git a/src/emacs.c b/src/emacs.c
index 7acf3f59e4d..9892ed29bab 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -859,7 +859,8 @@ Usage: %s [--batch] [-t term] [--terminal term]\n\
859 [-q] [--no-init-file] [-u user] [--user user] [--debug-init]\n\ 859 [-q] [--no-init-file] [-u user] [--user user] [--debug-init]\n\
860 [--unibyte] [--multibyte] [--version] [--no-site-file]\n\ 860 [--unibyte] [--multibyte] [--version] [--no-site-file]\n\
861 [-f func] [--funcall func] [-l file] [--load file] [--eval expr]\n\ 861 [-f func] [--funcall func] [-l file] [--load file] [--eval expr]\n\
862 [--insert file] [+linenum] file-to-visit [--kill]\n\ 862 [--execute expr] [--visit file] [--file file] [--insert file]\n\
863 [+linenum] file-to-visit [--kill]\n\
863Report bugs to bug-gnu-emacs@gnu.org. First, please see\n\ 864Report bugs to bug-gnu-emacs@gnu.org. First, please see\n\
864the Bugs section of the Emacs manual or the file BUGS.\n", argv[0]); 865the Bugs section of the Emacs manual or the file BUGS.\n", argv[0]);
865 exit (0); 866 exit (0);
@@ -1379,7 +1380,10 @@ the Bugs section of the Emacs manual or the file BUGS.\n", argv[0]);
1379 extern void _mcleanup (); 1380 extern void _mcleanup ();
1380 extern char etext; 1381 extern char etext;
1381 extern void safe_bcopy (); 1382 extern void safe_bcopy ();
1383 extern void dump_opcode_frequencies ();
1384
1382 atexit (_mcleanup); 1385 atexit (_mcleanup);
1386 // atexit (dump_opcode_frequencies);
1383 /* This uses safe_bcopy because that function comes first in the 1387 /* This uses safe_bcopy because that function comes first in the
1384 Emacs executable. It might be better to use something that 1388 Emacs executable. It might be better to use something that
1385 gives the start of the text segment, but start_of_text is not 1389 gives the start of the text segment, but start_of_text is not
@@ -1484,8 +1488,10 @@ struct standard_args standard_args[] =
1484 { "-f", "--funcall", 0, 1 }, 1488 { "-f", "--funcall", 0, 1 },
1485 { "-funcall", 0, 0, 1 }, 1489 { "-funcall", 0, 0, 1 },
1486 { "-eval", "--eval", 0, 1 }, 1490 { "-eval", "--eval", 0, 1 },
1491 { "-execute", "--execute", 0, 1 },
1487 { "-find-file", "--find-file", 0, 1 }, 1492 { "-find-file", "--find-file", 0, 1 },
1488 { "-visit", "--visit", 0, 1 }, 1493 { "-visit", "--visit", 0, 1 },
1494 { "-file", "--file", 0, 1 },
1489 { "-insert", "--insert", 0, 1 }, 1495 { "-insert", "--insert", 0, 1 },
1490 /* This should be processed after ordinary file name args and the like. */ 1496 /* This should be processed after ordinary file name args and the like. */
1491 { "-kill", "--kill", -10, 0 }, 1497 { "-kill", "--kill", -10, 0 },