aboutsummaryrefslogtreecommitdiffstats
path: root/lib-src
diff options
context:
space:
mode:
authorPaul Eggert2015-08-27 02:36:56 -0700
committerPaul Eggert2015-08-27 02:37:35 -0700
commit2934c21f2d74d9043420db1661704f080718873a (patch)
tree2bfaa56bcfbc431e9815a6bfb28ca93987dca115 /lib-src
parent862561f4a642416259ed265ba8c5071cffa4f303 (diff)
downloademacs-2934c21f2d74d9043420db1661704f080718873a.tar.gz
emacs-2934c21f2d74d9043420db1661704f080718873a.zip
Use straight quotes in lib-src diagnostics
These auxiliary programs can’t use Emacs’s text-quoting-style, and it’s too much trouble to redo that mechanism by hand. So just use straight quotes for now. * lib-src/ebrowse.c (main): * lib-src/emacsclient.c (decode_options, main): * lib-src/etags.c (Ada_help, default_C_help, Cplusplus_help) (Forth_help, HTML_help, Lisp_help, Makefile_help, Objc_help) (Perl_help, PHP_help, Python_help, Scheme_help, TeX_help, auto_help) (none_help, print_language_names, print_help, add_regex) (suggest_asking_for_help): * lib-src/make-docfile.c (write_c_args, scan_c_stream): Use straight quotes in diagnostics.
Diffstat (limited to 'lib-src')
-rw-r--r--lib-src/ebrowse.c12
-rw-r--r--lib-src/emacsclient.c4
-rw-r--r--lib-src/etags.c104
-rw-r--r--lib-src/make-docfile.c4
4 files changed, 62 insertions, 62 deletions
diff --git a/lib-src/ebrowse.c b/lib-src/ebrowse.c
index 5c1e9d99bb8..09edc7d3db3 100644
--- a/lib-src/ebrowse.c
+++ b/lib-src/ebrowse.c
@@ -3747,27 +3747,27 @@ main (int argc, char **argv)
3747 fp = fopen (out_filename, "r"); 3747 fp = fopen (out_filename, "r");
3748 if (fp == NULL) 3748 if (fp == NULL)
3749 { 3749 {
3750 yyerror ("file `%s' must exist for --append", out_filename); 3750 yyerror ("file '%s' must exist for --append", out_filename);
3751 exit (EXIT_FAILURE); 3751 exit (EXIT_FAILURE);
3752 } 3752 }
3753 3753
3754 rc = fseek (fp, 0, SEEK_END); 3754 rc = fseek (fp, 0, SEEK_END);
3755 if (rc == -1) 3755 if (rc == -1)
3756 { 3756 {
3757 yyerror ("error seeking in file `%s'", out_filename); 3757 yyerror ("error seeking in file '%s'", out_filename);
3758 exit (EXIT_FAILURE); 3758 exit (EXIT_FAILURE);
3759 } 3759 }
3760 3760
3761 rc = ftell (fp); 3761 rc = ftell (fp);
3762 if (rc == -1) 3762 if (rc == -1)
3763 { 3763 {
3764 yyerror ("error getting size of file `%s'", out_filename); 3764 yyerror ("error getting size of file '%s'", out_filename);
3765 exit (EXIT_FAILURE); 3765 exit (EXIT_FAILURE);
3766 } 3766 }
3767 3767
3768 else if (rc == 0) 3768 else if (rc == 0)
3769 { 3769 {
3770 yyerror ("file `%s' is empty", out_filename); 3770 yyerror ("file '%s' is empty", out_filename);
3771 /* It may be ok to use an empty file for appending. 3771 /* It may be ok to use an empty file for appending.
3772 exit (EXIT_FAILURE); */ 3772 exit (EXIT_FAILURE); */
3773 } 3773 }
@@ -3778,7 +3778,7 @@ main (int argc, char **argv)
3778 yyout = fopen (out_filename, f_append ? "a" : "w"); 3778 yyout = fopen (out_filename, f_append ? "a" : "w");
3779 if (yyout == NULL) 3779 if (yyout == NULL)
3780 { 3780 {
3781 yyerror ("cannot open output file `%s'", out_filename); 3781 yyerror ("cannot open output file '%s'", out_filename);
3782 exit (EXIT_FAILURE); 3782 exit (EXIT_FAILURE);
3783 } 3783 }
3784 } 3784 }
@@ -3806,7 +3806,7 @@ main (int argc, char **argv)
3806 FILE *fp = fopen (input_filenames[i], "r"); 3806 FILE *fp = fopen (input_filenames[i], "r");
3807 3807
3808 if (fp == NULL) 3808 if (fp == NULL)
3809 yyerror ("cannot open input file `%s'", input_filenames[i]); 3809 yyerror ("cannot open input file '%s'", input_filenames[i]);
3810 else 3810 else
3811 { 3811 {
3812 char *file; 3812 char *file;
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 44262400504..c3e56351a48 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -539,7 +539,7 @@ decode_options (int argc, char **argv)
539 break; 539 break;
540 540
541 default: 541 default:
542 message (true, "Try `%s --help' for more information\n", progname); 542 message (true, "Try '%s --help' for more information\n", progname);
543 exit (EXIT_FAILURE); 543 exit (EXIT_FAILURE);
544 break; 544 break;
545 } 545 }
@@ -1611,7 +1611,7 @@ main (int argc, char **argv)
1611 if ((argc - optind < 1) && !eval && current_frame) 1611 if ((argc - optind < 1) && !eval && current_frame)
1612 { 1612 {
1613 message (true, "%s: file name or argument required\n" 1613 message (true, "%s: file name or argument required\n"
1614 "Try `%s --help' for more information\n", 1614 "Try '%s --help' for more information\n",
1615 progname, progname); 1615 progname, progname);
1616 exit (EXIT_FAILURE); 1616 exit (EXIT_FAILURE);
1617 } 1617 }
diff --git a/lib-src/etags.c b/lib-src/etags.c
index 8b7f53c808b..f34c985109d 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -515,7 +515,7 @@ static const char *Ada_suffixes [] =
515 { "ads", "adb", "ada", NULL }; 515 { "ads", "adb", "ada", NULL };
516static const char Ada_help [] = 516static const char Ada_help [] =
517"In Ada code, functions, procedures, packages, tasks and types are\n\ 517"In Ada code, functions, procedures, packages, tasks and types are\n\
518tags. Use the `--packages-only' option to create tags for\n\ 518tags. Use the '--packages-only' option to create tags for\n\
519packages only.\n\ 519packages only.\n\
520Ada tag names have suffixes indicating the type of entity:\n\ 520Ada tag names have suffixes indicating the type of entity:\n\
521 Entity type: Qualifier:\n\ 521 Entity type: Qualifier:\n\
@@ -526,9 +526,9 @@ Ada tag names have suffixes indicating the type of entity:\n\
526 package body /b\n\ 526 package body /b\n\
527 type /t\n\ 527 type /t\n\
528 task /k\n\ 528 task /k\n\
529Thus, `M-x find-tag <RET> bidule/b <RET>' will go directly to the\n\ 529Thus, 'M-x find-tag <RET> bidule/b <RET>' will go directly to the\n\
530body of the package `bidule', while `M-x find-tag <RET> bidule <RET>'\n\ 530body of the package 'bidule', while 'M-x find-tag <RET> bidule <RET>'\n\
531will just search for any tag `bidule'."; 531will just search for any tag 'bidule'.";
532 532
533/* Assembly code */ 533/* Assembly code */
534static const char *Asm_suffixes [] = 534static const char *Asm_suffixes [] =
@@ -555,22 +555,22 @@ static const char *default_C_suffixes [] =
555#if CTAGS /* C help for Ctags */ 555#if CTAGS /* C help for Ctags */
556static const char default_C_help [] = 556static const char default_C_help [] =
557"In C code, any C function is a tag. Use -t to tag typedefs.\n\ 557"In C code, any C function is a tag. Use -t to tag typedefs.\n\
558Use -T to tag definitions of `struct', `union' and `enum'.\n\ 558Use -T to tag definitions of 'struct', 'union' and 'enum'.\n\
559Use -d to tag `#define' macro definitions and `enum' constants.\n\ 559Use -d to tag '#define' macro definitions and 'enum' constants.\n\
560Use --globals to tag global variables.\n\ 560Use --globals to tag global variables.\n\
561You can tag function declarations and external variables by\n\ 561You can tag function declarations and external variables by\n\
562using `--declarations', and struct members by using `--members'."; 562using '--declarations', and struct members by using '--members'.";
563#else /* C help for Etags */ 563#else /* C help for Etags */
564static const char default_C_help [] = 564static const char default_C_help [] =
565"In C code, any C function or typedef is a tag, and so are\n\ 565"In C code, any C function or typedef is a tag, and so are\n\
566definitions of `struct', `union' and `enum'. `#define' macro\n\ 566definitions of 'struct', 'union' and 'enum'. '#define' macro\n\
567definitions and `enum' constants are tags unless you specify\n\ 567definitions and 'enum' constants are tags unless you specify\n\
568`--no-defines'. Global variables are tags unless you specify\n\ 568'--no-defines'. Global variables are tags unless you specify\n\
569`--no-globals' and so are struct members unless you specify\n\ 569'--no-globals' and so are struct members unless you specify\n\
570`--no-members'. Use of `--no-globals', `--no-defines' and\n\ 570'--no-members'. Use of '--no-globals', '--no-defines' and\n\
571`--no-members' can make the tags table file much smaller.\n\ 571'--no-members' can make the tags table file much smaller.\n\
572You can tag function declarations and external variables by\n\ 572You can tag function declarations and external variables by\n\
573using `--declarations'."; 573using '--declarations'.";
574#endif /* C help for Ctags and Etags */ 574#endif /* C help for Ctags and Etags */
575 575
576static const char *Cplusplus_suffixes [] = 576static const char *Cplusplus_suffixes [] =
@@ -582,10 +582,10 @@ static const char Cplusplus_help [] =
582"In C++ code, all the tag constructs of C code are tagged. (Use\n\ 582"In C++ code, all the tag constructs of C code are tagged. (Use\n\
583--help --lang=c --lang=c++ for full help.)\n\ 583--help --lang=c --lang=c++ for full help.)\n\
584In addition to C tags, member functions are also recognized. Member\n\ 584In addition to C tags, member functions are also recognized. Member\n\
585variables are recognized unless you use the `--no-members' option.\n\ 585variables are recognized unless you use the '--no-members' option.\n\
586Tags for variables and functions in classes are named `CLASS::VARIABLE'\n\ 586Tags for variables and functions in classes are named 'CLASS::VARIABLE'\n\
587and `CLASS::FUNCTION'. `operator' definitions have tag names like\n\ 587and 'CLASS::FUNCTION'. 'operator' definitions have tag names like\n\
588`operator+'."; 588'operator+'.";
589 589
590static const char *Cjava_suffixes [] = 590static const char *Cjava_suffixes [] =
591 { "java", NULL }; 591 { "java", NULL };
@@ -612,7 +612,7 @@ defined in the file.";
612const char *Forth_suffixes [] = 612const char *Forth_suffixes [] =
613 { "fth", "tok", NULL }; 613 { "fth", "tok", NULL };
614static const char Forth_help [] = 614static const char Forth_help [] =
615"In Forth code, tags are words defined by `:',\n\ 615"In Forth code, tags are words defined by ':',\n\
616constant, code, create, defer, value, variable, buffer:, field."; 616constant, code, create, defer, value, variable, buffer:, field.";
617 617
618static const char *Fortran_suffixes [] = 618static const char *Fortran_suffixes [] =
@@ -623,18 +623,18 @@ static const char Fortran_help [] =
623static const char *HTML_suffixes [] = 623static const char *HTML_suffixes [] =
624 { "htm", "html", "shtml", NULL }; 624 { "htm", "html", "shtml", NULL };
625static const char HTML_help [] = 625static const char HTML_help [] =
626"In HTML input files, the tags are the `title' and the `h1', `h2',\n\ 626"In HTML input files, the tags are the 'title' and the 'h1', 'h2',\n\
627`h3' headers. Also, tags are `name=' in anchors and all\n\ 627'h3' headers. Also, tags are 'name=' in anchors and all\n\
628occurrences of `id='."; 628occurrences of 'id='.";
629 629
630static const char *Lisp_suffixes [] = 630static const char *Lisp_suffixes [] =
631 { "cl", "clisp", "el", "l", "lisp", "LSP", "lsp", "ml", NULL }; 631 { "cl", "clisp", "el", "l", "lisp", "LSP", "lsp", "ml", NULL };
632static const char Lisp_help [] = 632static const char Lisp_help [] =
633"In Lisp code, any function defined with `defun', any variable\n\ 633"In Lisp code, any function defined with 'defun', any variable\n\
634defined with `defvar' or `defconst', and in general the first\n\ 634defined with 'defvar' or 'defconst', and in general the first\n\
635argument of any expression that starts with `(def' in column zero\n\ 635argument of any expression that starts with '(def' in column zero\n\
636is a tag.\n\ 636is a tag.\n\
637The `--declarations' option tags \"(defvar foo)\" constructs too."; 637The '--declarations' option tags \"(defvar foo)\" constructs too.";
638 638
639static const char *Lua_suffixes [] = 639static const char *Lua_suffixes [] =
640 { "lua", "LUA", NULL }; 640 { "lua", "LUA", NULL };
@@ -645,7 +645,7 @@ static const char *Makefile_filenames [] =
645 { "Makefile", "makefile", "GNUMakefile", "Makefile.in", "Makefile.am", NULL}; 645 { "Makefile", "makefile", "GNUMakefile", "Makefile.in", "Makefile.am", NULL};
646static const char Makefile_help [] = 646static const char Makefile_help [] =
647"In makefiles, targets are tags; additionally, variables are tags\n\ 647"In makefiles, targets are tags; additionally, variables are tags\n\
648unless you specify `--no-globals'."; 648unless you specify '--no-globals'.";
649 649
650static const char *Objc_suffixes [] = 650static const char *Objc_suffixes [] =
651 { "lm", /* Objective lex file */ 651 { "lm", /* Objective lex file */
@@ -654,7 +654,7 @@ static const char *Objc_suffixes [] =
654static const char Objc_help [] = 654static const char Objc_help [] =
655"In Objective C code, tags include Objective C definitions for classes,\n\ 655"In Objective C code, tags include Objective C definitions for classes,\n\
656class categories, methods and protocols. Tags for variables and\n\ 656class categories, methods and protocols. Tags for variables and\n\
657functions in classes are named `CLASS::VARIABLE' and `CLASS::FUNCTION'.\n\ 657functions in classes are named 'CLASS::VARIABLE' and 'CLASS::FUNCTION'.\n\
658(Use --help --lang=c --lang=objc --lang=java for full help.)"; 658(Use --help --lang=c --lang=objc --lang=java for full help.)";
659 659
660static const char *Pascal_suffixes [] = 660static const char *Pascal_suffixes [] =
@@ -670,16 +670,16 @@ static const char *Perl_interpreters [] =
670 { "perl", "@PERL@", NULL }; 670 { "perl", "@PERL@", NULL };
671static const char Perl_help [] = 671static const char Perl_help [] =
672"In Perl code, the tags are the packages, subroutines and variables\n\ 672"In Perl code, the tags are the packages, subroutines and variables\n\
673defined by the `package', `sub', `my' and `local' keywords. Use\n\ 673defined by the 'package', 'sub', 'my' and 'local' keywords. Use\n\
674`--globals' if you want to tag global variables. Tags for\n\ 674'--globals' if you want to tag global variables. Tags for\n\
675subroutines are named `PACKAGE::SUB'. The name for subroutines\n\ 675subroutines are named 'PACKAGE::SUB'. The name for subroutines\n\
676defined in the default package is `main::SUB'."; 676defined in the default package is 'main::SUB'.";
677 677
678static const char *PHP_suffixes [] = 678static const char *PHP_suffixes [] =
679 { "php", "php3", "php4", NULL }; 679 { "php", "php3", "php4", NULL };
680static const char PHP_help [] = 680static const char PHP_help [] =
681"In PHP code, tags are functions, classes and defines. Unless you use\n\ 681"In PHP code, tags are functions, classes and defines. Unless you use\n\
682the `--no-members' option, vars are tags too."; 682the '--no-members' option, vars are tags too.";
683 683
684static const char *plain_C_suffixes [] = 684static const char *plain_C_suffixes [] =
685 { "pc", /* Pro*C file */ 685 { "pc", /* Pro*C file */
@@ -699,28 +699,28 @@ line.";
699static const char *Python_suffixes [] = 699static const char *Python_suffixes [] =
700 { "py", NULL }; 700 { "py", NULL };
701static const char Python_help [] = 701static const char Python_help [] =
702"In Python code, `def' or `class' at the beginning of a line\n\ 702"In Python code, 'def' or 'class' at the beginning of a line\n\
703generate a tag."; 703generate a tag.";
704 704
705/* Can't do the `SCM' or `scm' prefix with a version number. */ 705/* Can't do the `SCM' or `scm' prefix with a version number. */
706static const char *Scheme_suffixes [] = 706static const char *Scheme_suffixes [] =
707 { "oak", "sch", "scheme", "SCM", "scm", "SM", "sm", "ss", "t", NULL }; 707 { "oak", "sch", "scheme", "SCM", "scm", "SM", "sm", "ss", "t", NULL };
708static const char Scheme_help [] = 708static const char Scheme_help [] =
709"In Scheme code, tags include anything defined with `def' or with a\n\ 709"In Scheme code, tags include anything defined with 'def' or with a\n\
710construct whose name starts with `def'. They also include\n\ 710construct whose name starts with 'def'. They also include\n\
711variables set with `set!' at top level in the file."; 711variables set with 'set!' at top level in the file.";
712 712
713static const char *TeX_suffixes [] = 713static const char *TeX_suffixes [] =
714 { "bib", "clo", "cls", "ltx", "sty", "TeX", "tex", NULL }; 714 { "bib", "clo", "cls", "ltx", "sty", "TeX", "tex", NULL };
715static const char TeX_help [] = 715static const char TeX_help [] =
716"In LaTeX text, the argument of any of the commands `\\chapter',\n\ 716"In LaTeX text, the argument of any of the commands '\\chapter',\n\
717`\\section', `\\subsection', `\\subsubsection', `\\eqno', `\\label',\n\ 717'\\section', '\\subsection', '\\subsubsection', '\\eqno', '\\label',\n\
718`\\ref', `\\cite', `\\bibitem', `\\part', `\\appendix', `\\entry',\n\ 718'\\ref', '\\cite', '\\bibitem', '\\part', '\\appendix', '\\entry',\n\
719`\\index', `\\def', `\\newcommand', `\\renewcommand',\n\ 719'\\index', '\\def', '\\newcommand', '\\renewcommand',\n\
720`\\newenvironment' or `\\renewenvironment' is a tag.\n\ 720'\\newenvironment' or '\\renewenvironment' is a tag.\n\
721\n\ 721\n\
722Other commands can be specified by setting the environment variable\n\ 722Other commands can be specified by setting the environment variable\n\
723`TEXTAGS' to a colon-separated list like, for example,\n\ 723'TEXTAGS' to a colon-separated list like, for example,\n\
724 TEXTAGS=\"mycommand:myothercommand\"."; 724 TEXTAGS=\"mycommand:myothercommand\".";
725 725
726 726
@@ -738,11 +738,11 @@ C code are parsed as C code (use --help --lang=c --lang=yacc\n\
738for full help)."; 738for full help).";
739 739
740static const char auto_help [] = 740static const char auto_help [] =
741"`auto' is not a real language, it indicates to use\n\ 741"'auto' is not a real language, it indicates to use\n\
742a default language for files base on file name suffix and file contents."; 742a default language for files base on file name suffix and file contents.";
743 743
744static const char none_help [] = 744static const char none_help [] =
745"`none' is not a real language, it indicates to only do\n\ 745"'none' is not a real language, it indicates to only do\n\
746regexp processing on files."; 746regexp processing on files.";
747 747
748static const char no_lang_help [] = 748static const char no_lang_help [] =
@@ -809,8 +809,8 @@ default file names and dot suffixes:");
809 printf (" .%s", *ext); 809 printf (" .%s", *ext);
810 puts (""); 810 puts ("");
811 } 811 }
812 puts ("where `auto' means use default language for files based on file\n\ 812 puts ("where 'auto' means use default language for files based on file\n\
813name suffix, and `none' means only do regexp processing on files.\n\ 813name suffix, and 'none' means only do regexp processing on files.\n\
814If no language is specified and no matching suffix is found,\n\ 814If no language is specified and no matching suffix is found,\n\
815the first line of the file is read for a sharp-bang (#!) sequence\n\ 815the first line of the file is read for a sharp-bang (#!) sequence\n\
816followed by the name of an interpreter. If no such sequence is found,\n\ 816followed by the name of an interpreter. If no such sequence is found,\n\
@@ -950,8 +950,8 @@ Relative ones are stored relative to the output file's directory.\n");
950 puts (" If TAGNAME/ is present, the tags created are named.\n\ 950 puts (" If TAGNAME/ is present, the tags created are named.\n\
951 For example Tcl named tags can be created with:\n\ 951 For example Tcl named tags can be created with:\n\
952 --regex=\"/proc[ \\t]+\\([^ \\t]+\\)/\\1/.\".\n\ 952 --regex=\"/proc[ \\t]+\\([^ \\t]+\\)/\\1/.\".\n\
953 MODS are optional one-letter modifiers: `i' means to ignore case,\n\ 953 MODS are optional one-letter modifiers: 'i' means to ignore case,\n\
954 `m' means to allow multi-line matches, `s' implies `m' and\n\ 954 'm' means to allow multi-line matches, 's' implies 'm' and\n\
955 causes dot to match any character, including newline."); 955 causes dot to match any character, including newline.");
956 956
957 puts ("-R, --no-regex\n\ 957 puts ("-R, --no-regex\n\
@@ -1012,7 +1012,7 @@ Relative ones are stored relative to the output file's directory.\n");
1012 Print the version of the program.\n\ 1012 Print the version of the program.\n\
1013-h, --help\n\ 1013-h, --help\n\
1014 Print this help message.\n\ 1014 Print this help message.\n\
1015 Followed by one or more `--language' options prints detailed\n\ 1015 Followed by one or more '--language' options prints detailed\n\
1016 help about tag generation for the specified languages."); 1016 help about tag generation for the specified languages.");
1017 1017
1018 print_language_names (); 1018 print_language_names ();
@@ -5797,7 +5797,7 @@ add_regex (char *regexp_pattern, language *lang)
5797 need_filebuf = true; 5797 need_filebuf = true;
5798 break; 5798 break;
5799 default: 5799 default:
5800 error ("invalid regexp modifier `%c', ignoring", modifiers[0]); 5800 error ("invalid regexp modifier '%c', ignoring", modifiers[0]);
5801 break; 5801 break;
5802 } 5802 }
5803 5803
@@ -6368,7 +6368,7 @@ pfatal (const char *s1)
6368static void 6368static void
6369suggest_asking_for_help (void) 6369suggest_asking_for_help (void)
6370{ 6370{
6371 fprintf (stderr, "\tTry `%s --help' for a complete list of options.\n", 6371 fprintf (stderr, "\tTry '%s --help' for a complete list of options.\n",
6372 progname); 6372 progname);
6373 exit (EXIT_FAILURE); 6373 exit (EXIT_FAILURE);
6374} 6374}
diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index bada8df9f72..3d8f34f1a98 100644
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -507,7 +507,7 @@ write_c_args (char *func, char *buf, int minargs, int maxargs)
507 { 507 {
508 if (ident_length == 0) 508 if (ident_length == 0)
509 { 509 {
510 error ("empty arg list for `%s' should be (void), not ()", func); 510 error ("empty arg list for '%s' should be (void), not ()", func);
511 continue; 511 continue;
512 } 512 }
513 513
@@ -1163,7 +1163,7 @@ scan_c_stream (FILE *infile)
1163 } 1163 }
1164 else if (defunflag && maxargs == -1 && !saw_usage) 1164 else if (defunflag && maxargs == -1 && !saw_usage)
1165 /* The DOC should provide the usage form. */ 1165 /* The DOC should provide the usage form. */
1166 fprintf (stderr, "Missing `usage' for function `%s'.\n", 1166 fprintf (stderr, "Missing 'usage' for function '%s'.\n",
1167 input_buffer); 1167 input_buffer);
1168 } 1168 }
1169 } 1169 }