diff options
| author | Fabrice Popineau | 2012-10-01 16:22:23 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2012-10-01 16:22:23 +0200 |
| commit | 3d3bfa248930841abe983c5beb9ad095067d2410 (patch) | |
| tree | 43347a42b3b81083344a80d317648b20d9120de3 /lib-src | |
| parent | 2d7d1608381a4c14822e50ae42e2a6d748842cc3 (diff) | |
| download | emacs-3d3bfa248930841abe983c5beb9ad095067d2410.tar.gz emacs-3d3bfa248930841abe983c5beb9ad095067d2410.zip | |
Make make-docfile.c consistent with src/keyboard.c.
lib-src/make-docfile.c (write_globals): Special-case
Fexit_recursive_edit and Fabort_recursive_edit as well, as
functions that are _Noreturn, to be consistent with
src/keyboard.c.
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 7 | ||||
| -rw-r--r-- | lib-src/make-docfile.c | 4 |
2 files changed, 10 insertions, 1 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 32aa985eaff..2a8ac9b8131 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog | |||
| @@ -1,3 +1,10 @@ | |||
| 1 | 2012-10-01 Fabrice Popineau <fabrice.popineau@gmail.com> | ||
| 2 | |||
| 3 | * make-docfile.c (write_globals): Special-case | ||
| 4 | Fexit_recursive_edit and Fabort_recursive_edit as well, as | ||
| 5 | functions that are _Noreturn, to be consistent with | ||
| 6 | src/keyboard.c. | ||
| 7 | |||
| 1 | 2012-09-30 Eli Zaretskii <eliz@gnu.org> | 8 | 2012-09-30 Eli Zaretskii <eliz@gnu.org> |
| 2 | 9 | ||
| 3 | * ntlib.c (gettimeofday): Copy from src/w32.c. lib/gettime.c | 10 | * ntlib.c (gettimeofday): Copy from src/w32.c. lib/gettime.c |
diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c index 2654387fb37..411b7057861 100644 --- a/lib-src/make-docfile.c +++ b/lib-src/make-docfile.c | |||
| @@ -659,7 +659,9 @@ write_globals (void) | |||
| 659 | special hacks. */ | 659 | special hacks. */ |
| 660 | if (strcmp (globals[i].name, "Fthrow") == 0 | 660 | if (strcmp (globals[i].name, "Fthrow") == 0 |
| 661 | || strcmp (globals[i].name, "Ftop_level") == 0 | 661 | || strcmp (globals[i].name, "Ftop_level") == 0 |
| 662 | || strcmp (globals[i].name, "Fkill_emacs") == 0) | 662 | || strcmp (globals[i].name, "Fkill_emacs") == 0 |
| 663 | || strcmp (globals[i].name, "Fexit_recursive_edit") == 0 | ||
| 664 | || strcmp (globals[i].name, "Fabort_recursive_edit") == 0) | ||
| 663 | fprintf (outfile, "_Noreturn "); | 665 | fprintf (outfile, "_Noreturn "); |
| 664 | fprintf (outfile, "EXFUN (%s, ", globals[i].name); | 666 | fprintf (outfile, "EXFUN (%s, ", globals[i].name); |
| 665 | if (globals[i].value == -1) | 667 | if (globals[i].value == -1) |