Mercurial > hg > xemacs-beta

comparison src/emacs.c @ 239:41f2f0e326e9 r20-5b18

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-5b18
author cvs
date Mon, 13 Aug 2007 10:15:48 +0200
parents 89ec2bb86eea
children 51092a27c943
comparison
equal deleted inserted replaced
238:b5f2e56b938d 239:41f2f0e326e9
308 308
309 for (i = argc - 1; i >= 0; i--) 309 for (i = argc - 1; i >= 0; i--)
310 { 310 {
311 if (i == 0 || i > skip_args) 311 if (i == 0 || i > skip_args)
312 { 312 {
313 #ifdef _WIN32 313 #ifdef WINDOWSNT
314 if (i == 0) 314 if (i == 0)
315 { 315 {
316 /* Do not trust to what crt0 has stuffed into argv[0] */ 316 /* Do not trust to what crt0 has stuffed into argv[0] */
317 char full_exe_path [MAX_PATH]; 317 char full_exe_path [MAX_PATH];
318 GetModuleFileName (NULL, full_exe_path, MAX_PATH); 318 GetModuleFileName (NULL, full_exe_path, MAX_PATH);
639 inhibit_update_dumped_lisp = 1; 639 inhibit_update_dumped_lisp = 1;
640 #endif 640 #endif
641 noninteractive = 1; 641 noninteractive = 1;
642 } 642 }
643 643
644 /* Partially handle -no-packages and -vanilla. Packages are searched */ 644 /* Partially handle -no-autoloads, -no-packages and -vanilla. Packages */
645 /* prior to the rest of the command line being parsed in startup.el */ 645 /* are searched prior to the rest of the command line being parsed in */
646 /* startup.el */
646 if (argmatch (argv, argc, "-no-packages", "--no-packages", 647 if (argmatch (argv, argc, "-no-packages", "--no-packages",
647 6, NULL, &skip_args)) 648 6, NULL, &skip_args))
648 { 649 {
649 inhibit_package_init = 1; 650 inhibit_package_init = 1;
650 skip_args--; 651 skip_args--;
651 } 652 }
652 if (argmatch (argv, argc, "-vanilla", "--vanilla", 653 if (argmatch (argv, argc, "-vanilla", "--vanilla",
653 7, NULL, &skip_args)) 654 7, NULL, &skip_args))
654 { 655 {
656 inhibit_package_init = 1;
657 skip_args--;
658 }
659
660 if (argmatch (argv, argc, "-no-autoloads", "--no-autoloads",
661 7, NULL, &skip_args))
662 {
663 /* Inhibit everything */
655 inhibit_package_init = 1; 664 inhibit_package_init = 1;
656 inhibit_update_autoloads = 1; 665 inhibit_update_autoloads = 1;
657 inhibit_update_dumped_lisp = 1; 666 inhibit_update_dumped_lisp = 1;
658 skip_args--; 667 skip_args--;
659 } 668 }
1508 if (!initialized) 1517 if (!initialized)
1509 { 1518 {
1510 /* Handle -l loadup-and-dump, args passed by Makefile. */ 1519 /* Handle -l loadup-and-dump, args passed by Makefile. */
1511 if (argc > 2 + skip_args && !strcmp (argv[1 + skip_args], "-l")) 1520 if (argc > 2 + skip_args && !strcmp (argv[1 + skip_args], "-l"))
1512 load_me = build_string (argv[2 + skip_args]); 1521 load_me = build_string (argv[2 + skip_args]);
1513 #ifdef CANNOT_DUMP 1522 #if 0 /* CANNOT_DUMP - this can never be right in XEmacs --andyp */
1514 /* Unless next switch is -nl, load "loadup.el" first thing. */ 1523 /* Unless next switch is -nl, load "loadup.el" first thing. */
1515 if (!(argc > 1 + skip_args && !strcmp (argv[1 + skip_args], "-nl"))) 1524 if (!(argc > 1 + skip_args && !strcmp (argv[1 + skip_args], "-nl")))
1516 load_me = build_string ("loadup.el"); 1525 load_me = build_string ("loadup.el");
1517 #endif /* CANNOT_DUMP */ 1526 #endif /* CANNOT_DUMP */
1518 } 1527 }
1561 /* Handled by command-line-early in startup.el: */ 1570 /* Handled by command-line-early in startup.el: */
1562 { "-q", "--no-init-file", 50, 0 }, 1571 { "-q", "--no-init-file", 50, 0 },
1563 { "-unmapped", 0, 50, 0 }, 1572 { "-unmapped", 0, 50, 0 },
1564 { "-no-init-file", 0, 50, 0 }, 1573 { "-no-init-file", 0, 50, 0 },
1565 { "-vanilla", "--vanilla", 50, 0 }, 1574 { "-vanilla", "--vanilla", 50, 0 },
1575 { "-no-autoloads", "--no-autoloads", 50, 0 },
1566 { "-no-site-file", "--no-site-file", 40, 0 }, 1576 { "-no-site-file", "--no-site-file", 40, 0 },
1567 { "-no-packages", "--no-packages", 35, 0 }, 1577 { "-no-packages", "--no-packages", 35, 0 },
1568 { "-u", "--user", 30, 1 }, 1578 { "-u", "--user", 30, 1 },
1569 { "-user", 0, 30, 1 }, 1579 { "-user", 0, 30, 1 },
1570 { "-debug-init", "--debug-init", 20, 0 }, 1580 { "-debug-init", "--debug-init", 20, 0 },