diff options
| author | Paul Eggert | 2021-10-04 12:11:39 -0700 |
|---|---|---|
| committer | Paul Eggert | 2021-10-04 15:21:31 -0700 |
| commit | 68a256c89270ef9e97bca6097967a9ed2b050f4a (patch) | |
| tree | 7a3cca947c133bf7def967083f1054dfa4239322 /lib/ignore-value.h | |
| parent | 63cb65dccecb1146cdad7134e4b62ea3e1433880 (diff) | |
| download | emacs-68a256c89270ef9e97bca6097967a9ed2b050f4a.tar.gz emacs-68a256c89270ef9e97bca6097967a9ed2b050f4a.zip | |
Update from Gnulib
Make the following changes by hand, and run 'admin/merge-gnulib'.
* .gitignore: Add lib/malloc/*.gl.h.
* admin/merge-gnulib: Copy lib/af_alg.h and lib/save-cwd.h
directly from Gnulib, without worrying about Gnulib modules,
as these files are special cases.
(AVOIDED_MODULES): Remove malloc-posix.
* lib/malloc.c, lib/realloc.c, m4/malloc.m4, m4/realloc.m4:
* m4/year2038.m4: New files, copied from Gnulib.
* lib/malloca.c, lib/malloca.h:
* m4/close-stream.m4, m4/glibc21.m4, m4/malloca.m4:
Remove. These are either no longer present in Gnulib, or are no
longer needed by modules that Emacs uses.
* oldXMenu/AddPane.c, oldXmenu/Addsel.c: Include XmenuInt.h first;
needed for new Gnulib.
* src/xmenu.c: Call emacs_abort, not abort.
Diffstat (limited to 'lib/ignore-value.h')
| -rw-r--r-- | lib/ignore-value.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/ignore-value.h b/lib/ignore-value.h index 0a3cf1e95b4..6099abad97b 100644 --- a/lib/ignore-value.h +++ b/lib/ignore-value.h | |||
| @@ -2,17 +2,17 @@ | |||
| 2 | 2 | ||
| 3 | Copyright (C) 2008-2021 Free Software Foundation, Inc. | 3 | Copyright (C) 2008-2021 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | This program is free software: you can redistribute it and/or modify | 5 | This file is free software: you can redistribute it and/or modify |
| 6 | it under the terms of the GNU General Public License as published by | 6 | it under the terms of the GNU Lesser General Public License as |
| 7 | the Free Software Foundation; either version 3 of the License, or | 7 | published by the Free Software Foundation; either version 2.1 of the |
| 8 | (at your option) any later version. | 8 | License, or (at your option) any later version. |
| 9 | 9 | ||
| 10 | This program is distributed in the hope that it will be useful, | 10 | This file is distributed in the hope that it will be useful, |
| 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 13 | GNU General Public License for more details. | 13 | GNU Lesser General Public License for more details. |
| 14 | 14 | ||
| 15 | You should have received a copy of the GNU General Public License | 15 | You should have received a copy of the GNU Lesser General Public License |
| 16 | along with this program. If not, see <https://www.gnu.org/licenses/>. */ | 16 | along with this program. If not, see <https://www.gnu.org/licenses/>. */ |
| 17 | 17 | ||
| 18 | /* Written by Jim Meyering, Eric Blake and Pádraig Brady. */ | 18 | /* Written by Jim Meyering, Eric Blake and Pádraig Brady. */ |