diff options
| author | Stefan Kangas <stefan@marxist.se> | 2022-07-20 10:30:41 +0200 |
|---|---|---|
| committer | Stefan Kangas <stefan@marxist.se> | 2022-07-20 10:30:41 +0200 |
| commit | bbac84ac9b169103c39069ded34dd213b7240f1f (patch) | |
| tree | c2d4d5143862d3958a261416d5ba89247b5d3654 /ChangeLog.3 | |
| parent | 83753d05ebb784d1d59687f3f488721f8a2edbb2 (diff) | |
| parent | cb911febc6c7a7c0ad451eb5514b3e32dac4af44 (diff) | |
| download | emacs-bbac84ac9b169103c39069ded34dd213b7240f1f.tar.gz | |
Merge from origin/emacs-28
cb911febc6 ; Fix typos
# Conflicts:
# test/lisp/net/tramp-tests.el
Diffstat (limited to 'ChangeLog.3')
| -rw-r--r-- | ChangeLog.3 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ChangeLog.3 b/ChangeLog.3 index 7af0205e8cf..0eabd57bc56 100644 --- a/ChangeLog.3 +++ b/ChangeLog.3 @@ -77358,7 +77358,7 @@ still don't work). (tramp-crypt-handle-access-file): New defun. (tramp-crypt-do-copy-or-rename-file): Short track if both files - are on a crypted remote dir. + are on an encrypted remote dir. * lisp/net/tramp.el (file-notify-rm-watch): Declare. (tramp-inhibit-progress-reporter): New defvar. |