diff options
author | Glenn Morris <rgm@gnu.org> | 2021-10-05 07:50:22 -0700 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2021-10-05 07:50:22 -0700 |
commit | 2dc88a27a46ab1798383483454e45a7d69caa3d0 (patch) | |
tree | 23d4b8709c7c3c12f65c97ac4f51b9cc13d47f35 /lib/memmem.c | |
parent | 6090e0f23e80945641970a6caa3681870b80e7fa (diff) | |
parent | 63abe976ce65e42d67730d0577854867bc83e69c (diff) | |
download | emacs-2dc88a27a46ab1798383483454e45a7d69caa3d0.tar.gz emacs-2dc88a27a46ab1798383483454e45a7d69caa3d0.tar.bz2 emacs-2dc88a27a46ab1798383483454e45a7d69caa3d0.zip |
Merge from origin/emacs-28
63abe976ce (origin/emacs-28) Document minibuffer-default-prompt-forma...
b5afbedc90 Backward compatibility option for 'nobreak-char-display'
ea1b728a06 ; * lisp/dired.el: Fix typo.
984eafeb98 Unbreak the build after Gnulib update
5946370cd1 Check, whether an FUSE mount has been broken in Tramp
90575a6c0c Disable 'nobreak-char-display' in Eldoc buffers
570e2c9a17 Fix small error in comint-send-input
fd7bb31412 Update documentation of search-whitespace-regexp
1f4ced47a1 Fix cc-compat.el syntax error
b431f54c1b Mention `seq-uniq' in `delete-dups' documentation
0a7bab689c ; Minor stylistic fixes found by checkdoc
e2861e2d08 ; * etc/NEWS: Fix typo.
1a65d49931 Port recent Gnulib changes to MS-Windows
68a256c892 Update from Gnulib
63cb65dcce * Fix mh tests for native comp builds (bug#50975)
e606cc6f40 * Fix `batch-native-compile' not to spawn a subprocess
894dfe70da Fix native-compilation build from tarball on Cygwin
2ce5e08058 Remove U+FE0F from script-representative-chars
# Conflicts:
# etc/NEWS
Diffstat (limited to 'lib/memmem.c')
-rw-r--r-- | lib/memmem.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/memmem.c b/lib/memmem.c index 87266fa87af..142de576d93 100644 --- a/lib/memmem.c +++ b/lib/memmem.c @@ -2,18 +2,18 @@ Foundation, Inc. This file is part of the GNU C Library. - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3, or (at your option) - any later version. + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + This file is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + GNU Lesser General Public License for more details. - You should have received a copy of the GNU General Public License along - with this program; if not, see <https://www.gnu.org/licenses/>. */ + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ /* This particular implementation was written by Eric Blake, 2008. */ |