diff options
| author | Paul Eggert | 2017-09-29 22:06:33 -0700 |
|---|---|---|
| committer | Paul Eggert | 2017-09-29 22:06:33 -0700 |
| commit | 20a09de953f437109a098fa8c4d380663d921481 (patch) | |
| tree | eef1d8cc712d140e95f297bd00e9e2d058a36667 /lib-src | |
| parent | e6fc3b147dded8d0833853491ad5e3d7b22f390e (diff) | |
| parent | 3ab2f9bbb96d0425a9396e08b2f462de3fd7818d (diff) | |
| download | emacs-20a09de953f437109a098fa8c4d380663d921481.tar.gz emacs-20a09de953f437109a098fa8c4d380663d921481.zip | |
Merge from origin/emacs-26
3ab2f9bbb9 Merge from gnulib
cbc8324488 Prefer HTTPS to HTTP for gnu.org
bbda601d1d ; Spelling fixes
695cf5300b Wait for frame visibility with timeout in w32term too
e1f6e3127a Bring back the busy wait after x_make_frame_visible (Bug#2...
bccf635217 ; * src/gtkutil.c (xg_check_special_colors): Add another G...
26d58f0c58 ; Standardize license notices
61225964ed Revert "bug#28609: simple.el"
a75ab3b3fb bug#28609: simple.el
c7a21430c1 ; * etc/NEWS: Fix last change.
33401b26b1 Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/e...
d4b2bbdc73 Merge branch 'emacs-26' into scratch/org-mode-merge
c1ac8c170f Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/e...
af130f900f Fix ert backtrace saving for non-`signal'ed errors (Bug#28...
7476eeaa23 Revert "Fix build on macOS (bug#28571)"
fec63089d5 Fix build on macOS (bug#28571)
0f9a78e770 Add tests for `css-current-defun-name'
88a0dd71f1 In w32fullscreen_hook don't add decorations to undecorated...
18073beb14 Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/e...
1eef11b7be Fix doc string of 'dired-listing-switches'
eaefbc26d5 ; Add files missing in ab351d442d7
ab351d442d Update Org to v9.1.1
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog.1 | 2 | ||||
| -rw-r--r-- | lib-src/ntlib.c | 2 | ||||
| -rw-r--r-- | lib-src/ntlib.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib-src/ChangeLog.1 b/lib-src/ChangeLog.1 index a9783e9f60b..417e57f3bb8 100644 --- a/lib-src/ChangeLog.1 +++ b/lib-src/ChangeLog.1 | |||
| @@ -8624,4 +8624,4 @@ | |||
| 8624 | GNU General Public License for more details. | 8624 | GNU General Public License for more details. |
| 8625 | 8625 | ||
| 8626 | You should have received a copy of the GNU General Public License | 8626 | You should have received a copy of the GNU General Public License |
| 8627 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. | 8627 | along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. |
diff --git a/lib-src/ntlib.c b/lib-src/ntlib.c index 9908f0fa452..3754f914e33 100644 --- a/lib-src/ntlib.c +++ b/lib-src/ntlib.c | |||
| @@ -18,7 +18,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |||
| 18 | GNU General Public License for more details. | 18 | GNU General Public License for more details. |
| 19 | 19 | ||
| 20 | You should have received a copy of the GNU General Public License | 20 | You should have received a copy of the GNU General Public License |
| 21 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | 21 | along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */ |
| 22 | 22 | ||
| 23 | #include <windows.h> | 23 | #include <windows.h> |
| 24 | #include <stdlib.h> | 24 | #include <stdlib.h> |
diff --git a/lib-src/ntlib.h b/lib-src/ntlib.h index b69a40b4f03..f7ee305e861 100644 --- a/lib-src/ntlib.h +++ b/lib-src/ntlib.h | |||
| @@ -14,7 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |||
| 14 | GNU General Public License for more details. | 14 | GNU General Public License for more details. |
| 15 | 15 | ||
| 16 | You should have received a copy of the GNU General Public License | 16 | You should have received a copy of the GNU General Public License |
| 17 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | 17 | along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */ |
| 18 | 18 | ||
| 19 | #include <pwd.h> | 19 | #include <pwd.h> |
| 20 | #include <malloc.h> | 20 | #include <malloc.h> |