comparison src/emacs.c @ 215:1f0dabaa0855 r20-4b6

Import from CVS: tag r20-4b6
author cvs
date Mon, 13 Aug 2007 10:07:35 +0200
parents 78f53ef88e17
children d44af0c54775
comparison
equal deleted inserted replaced
214:c5d88c05e1e9 215:1f0dabaa0855
623 skip_args--; 623 skip_args--;
624 } 624 }
625 625
626 /* Partially handle the -version and -help switches: they imply -batch, 626 /* Partially handle the -version and -help switches: they imply -batch,
627 but are not removed from the list. */ 627 but are not removed from the list. */
628 if (argmatch (argv, argc, "-help", "--help", 3, NULL, &skip_args) || 628 if (argmatch (argv, argc, "-help", "--help", 3, NULL, &skip_args))
629 argmatch (argv, argc, "-?", 0, 2, NULL, &skip_args) ||
630 argmatch (argv, argc, "-flags", "--flags", 6, NULL, &skip_args))
631 noninteractive = 1, skip_args--; 629 noninteractive = 1, skip_args--;
632 630
633 if (argmatch (argv, argc, "-version", "--version", 3, NULL, &skip_args) || 631 if (argmatch (argv, argc, "-version", "--version", 3, NULL, &skip_args) ||
634 argmatch (argv, argc, "-V", 0, 2, NULL, &skip_args)) 632 argmatch (argv, argc, "-V", 0, 2, NULL, &skip_args))
635 noninteractive = 1, skip_args--; 633 noninteractive = 1, skip_args--;
1508 { "-nl", "--no-shared-memory", 100, 0 }, 1506 { "-nl", "--no-shared-memory", 100, 0 },
1509 { "-t", "--terminal", 95, 1 }, 1507 { "-t", "--terminal", 95, 1 },
1510 { "-nw", "--no-windows", 90, 0 }, 1508 { "-nw", "--no-windows", 90, 0 },
1511 { "-batch", "--batch", 85, 0 }, 1509 { "-batch", "--batch", 85, 0 },
1512 { "-help", "--help", 80, 0 }, 1510 { "-help", "--help", 80, 0 },
1513 { "-flags", "--flags", 80, 0 },
1514 { "-h", 0, 80, 0 },
1515 { "-?", 0, 80, 0 },
1516 { "-version", "--version", 75, 0 }, 1511 { "-version", "--version", 75, 0 },
1517 { "-V", 0, 75, 0 }, 1512 { "-V", 0, 75, 0 },
1518 { "-d", "--display", 80, 1 }, 1513 { "-d", "--display", 80, 1 },
1519 { "-display", 0, 80, 1 }, 1514 { "-display", 0, 80, 1 },
1520 { "-NXHost", 0, 79, 0 }, 1515 { "-NXHost", 0, 79, 0 },