diff options
| author | John Wiegley | 2016-01-11 22:48:07 -0800 |
|---|---|---|
| committer | John Wiegley | 2016-01-11 22:48:07 -0800 |
| commit | 1dd4f26ab6c1f14628d9fcf03b0cca7e54d52302 (patch) | |
| tree | fc34bd815956a80c35f1e9a0f836a5378bf4b1ed /lib | |
| parent | c043d9731b499a241830d705e9055c9e42ccf28c (diff) | |
| parent | ef33bc7fcf7b2e9fc41706ebce3bfbc814b0e832 (diff) | |
| download | emacs-1dd4f26ab6c1f14628d9fcf03b0cca7e54d52302.tar.gz emacs-1dd4f26ab6c1f14628d9fcf03b0cca7e54d52302.zip | |
Merge from origin/emacs-25
ef33bc7 Spelling and grammar fixes
9c3dbab Fix copyright years by hand
0e96320 Update copyright year to 2016
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/getopt_.h | 4 | ||||
| -rw-r--r-- | lib/save-cwd.c | 2 | ||||
| -rw-r--r-- | lib/save-cwd.h | 2 | ||||
| -rw-r--r-- | lib/unsetenv.c | 3 |
4 files changed, 6 insertions, 5 deletions
diff --git a/lib/getopt_.h b/lib/getopt_.h index 6c719ee4b53..cd6ba056525 100644 --- a/lib/getopt_.h +++ b/lib/getopt_.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* Declarations for getopt. | 1 | /* Declarations for getopt. |
| 2 | Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2007, 2009-2015 Free | 2 | Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2007, 2009-2016 Free |
| 3 | Software Foundation, Inc. | 3 | Software Foundation, Inc. |
| 4 | This file is part of the GNU C Library. | 4 | This file is part of the GNU C Library. |
| 5 | 5 | ||
| @@ -130,7 +130,7 @@ | |||
| 130 | 130 | ||
| 131 | /* The definition of _GL_ARG_NONNULL is copied here. */ | 131 | /* The definition of _GL_ARG_NONNULL is copied here. */ |
| 132 | /* A C macro for declaring that specific arguments must not be NULL. | 132 | /* A C macro for declaring that specific arguments must not be NULL. |
| 133 | Copyright (C) 2009-2015 Free Software Foundation, Inc. | 133 | Copyright (C) 2009-2016 Free Software Foundation, Inc. |
| 134 | 134 | ||
| 135 | This program is free software: you can redistribute it and/or modify it | 135 | This program is free software: you can redistribute it and/or modify it |
| 136 | under the terms of the GNU General Public License as published | 136 | under the terms of the GNU General Public License as published |
diff --git a/lib/save-cwd.c b/lib/save-cwd.c index d13a743707d..1fa5d69e857 100644 --- a/lib/save-cwd.c +++ b/lib/save-cwd.c | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* save-cwd.c -- Save and restore current working directory. | 1 | /* save-cwd.c -- Save and restore current working directory. |
| 2 | 2 | ||
| 3 | Copyright (C) 1995, 1997-1998, 2003-2006, 2009-2015 Free Software | 3 | Copyright (C) 1995, 1997-1998, 2003-2006, 2009-2016 Free Software |
| 4 | Foundation, Inc. | 4 | Foundation, Inc. |
| 5 | 5 | ||
| 6 | This program is free software: you can redistribute it and/or modify | 6 | This program is free software: you can redistribute it and/or modify |
diff --git a/lib/save-cwd.h b/lib/save-cwd.h index 36e0b101662..9b296cda5a4 100644 --- a/lib/save-cwd.h +++ b/lib/save-cwd.h | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* Save and restore current working directory. | 1 | /* Save and restore current working directory. |
| 2 | 2 | ||
| 3 | Copyright (C) 1995, 1997-1998, 2003, 2009-2015 Free Software | 3 | Copyright (C) 1995, 1997-1998, 2003, 2009-2016 Free Software |
| 4 | Foundation, Inc. | 4 | Foundation, Inc. |
| 5 | 5 | ||
| 6 | This program is free software: you can redistribute it and/or modify | 6 | This program is free software: you can redistribute it and/or modify |
diff --git a/lib/unsetenv.c b/lib/unsetenv.c index 87f41d59a50..7f1e65a3412 100644 --- a/lib/unsetenv.c +++ b/lib/unsetenv.c | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | /* Copyright (C) 1992, 1995-2002, 2005-2015 Free Software Foundation, Inc. | 1 | /* Copyright (C) 1992, 1995-2002, 2005-2016 Free Software Foundation, |
| 2 | Inc. | ||
| 2 | This file is part of the GNU C Library. | 3 | This file is part of the GNU C Library. |
| 3 | 4 | ||
| 4 | This program is free software: you can redistribute it and/or modify | 5 | This program is free software: you can redistribute it and/or modify |