diff options
| author | Stefan Kangas <stefan@marxist.se> | 2022-07-14 11:37:42 +0200 |
|---|---|---|
| committer | Stefan Kangas <stefan@marxist.se> | 2022-07-14 11:37:42 +0200 |
| commit | 4e79f77635a80e0c25841ba15feb0e70c8824516 (patch) | |
| tree | 7f68cf7d809a10e6c2501fb3d9451047fb8da051 /lisp/org | |
| parent | e1d93302c29916e738552484b9363c5b9e77c5c1 (diff) | |
| parent | 5e47ec95118c06dd66cd488ad25775d801d75c0c (diff) | |
| download | emacs-4e79f77635a80e0c25841ba15feb0e70c8824516.tar.gz emacs-4e79f77635a80e0c25841ba15feb0e70c8824516.tar.bz2 emacs-4e79f77635a80e0c25841ba15feb0e70c8824516.zip | |
Merge from origin/emacs-28
5e47ec9511 ; * lisp/url/url-http.el (url-http-parse-headers): Fix typo.
ba0871bef1 ; Fix typos: prefer American spelling
e3e7f31faa Adapt Tramp doc
# Conflicts:
# etc/NEWS
# etc/themes/modus-themes.el
# lisp/emacs-lisp/byte-opt.el
# test/lisp/so-long-tests/spelling-tests.el
Diffstat (limited to 'lisp/org')
| -rw-r--r-- | lisp/org/ChangeLog.1 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/org/ChangeLog.1 b/lisp/org/ChangeLog.1 index 7e08d1a3c9a..836e1430dfe 100644 --- a/lisp/org/ChangeLog.1 +++ b/lisp/org/ChangeLog.1 @@ -4001,7 +4001,7 @@ buffer. (org-agenda-ignore-drawer-properties): New option. (org-agenda-prepare-buffers): - Honour `org-agenda-ignore-drawer-properties'. + Honor `org-agenda-ignore-drawer-properties'. * org-clock.el (org-clock-goto): Recenter to thrd line @@ -4134,7 +4134,7 @@ (orgstruct-heading-prefix-regexp, orgstruct-setup-hook): New options. (orgstruct-initialized): New variable. - (org-get-local-variables): Honour state property. + (org-get-local-variables): Honor state property. (org-run-like-in-org-mode): Use `let' instead of `progv'. Do not override variables with non-default values. (org-forward-heading-same-level): Do not skip to headlines on |