diff options
| author | Po Lu | 2021-12-10 14:50:21 +0800 |
|---|---|---|
| committer | Po Lu | 2021-12-10 14:50:21 +0800 |
| commit | cc0f147180300b672894de931bee76b2a3a719e9 (patch) | |
| tree | 2fca1fb8adcb4aa1726f3274922f78eafe9a1aa5 /lisp/ChangeLog.17 | |
| parent | 6919d5a7c0a23c14ae77f7c708ea6d0ef2478108 (diff) | |
| parent | 6e865a7171d80cd91b54c6d71b88d960b920abe3 (diff) | |
| download | emacs-cc0f147180300b672894de931bee76b2a3a719e9.tar.gz emacs-cc0f147180300b672894de931bee76b2a3a719e9.zip | |
Merge remote-tracking branch 'origin/master' into feature/pgtk
Diffstat (limited to 'lisp/ChangeLog.17')
| -rw-r--r-- | lisp/ChangeLog.17 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/ChangeLog.17 b/lisp/ChangeLog.17 index 14a6c5d06e4..4dd3df5953b 100644 --- a/lisp/ChangeLog.17 +++ b/lisp/ChangeLog.17 | |||
| @@ -10766,7 +10766,7 @@ | |||
| 10766 | * emacs-lisp/find-gc.el (find-gc-source-directory): Give it a value. | 10766 | * emacs-lisp/find-gc.el (find-gc-source-directory): Give it a value. |
| 10767 | (find-gc-source-files): Update some names. | 10767 | (find-gc-source-files): Update some names. |
| 10768 | (trace-call-tree): Simplify and update. | 10768 | (trace-call-tree): Simplify and update. |
| 10769 | Avoid predictable temp-file names. (http://bugs.debian.org/747100) | 10769 | Avoid predictable temp-file names. (https://bugs.debian.org/747100) |
| 10770 | This is CVE-2014-3422. | 10770 | This is CVE-2014-3422. |
| 10771 | 10771 | ||
| 10772 | 2014-05-08 Stefan Monnier <monnier@iro.umontreal.ca> | 10772 | 2014-05-08 Stefan Monnier <monnier@iro.umontreal.ca> |
| @@ -17742,7 +17742,7 @@ | |||
| 17742 | 2013-10-13 Glenn Morris <rgm@gnu.org> | 17742 | 2013-10-13 Glenn Morris <rgm@gnu.org> |
| 17743 | 17743 | ||
| 17744 | * progmodes/sh-script.el (sh-mark-line, sh-learn-buffer-indent): | 17744 | * progmodes/sh-script.el (sh-mark-line, sh-learn-buffer-indent): |
| 17745 | Occur buffers are read-only. http://bugs.debian.org/720775 | 17745 | Occur buffers are read-only. https://bugs.debian.org/720775 |
| 17746 | 17746 | ||
| 17747 | * emacs-lisp/authors.el (authors-fixed-entries): | 17747 | * emacs-lisp/authors.el (authors-fixed-entries): |
| 17748 | Comment out old alpha stuff. | 17748 | Comment out old alpha stuff. |