diff options
author | Stefan Kangas <stefan@marxist.se> | 2020-11-20 15:17:22 +0100 |
---|---|---|
committer | Kyle Meyer <kyle@kyleam.com> | 2020-11-22 21:17:28 -0500 |
commit | 0abb6de0cfda31e99b077117fa802495d31821ab (patch) | |
tree | 6dd5aa178c2cfdf26c90ec18c9ceeec10ac2d59b | |
parent | 5272d97e5cefbc648a38be02ea99137f095e327a (diff) | |
download | org-mode-0abb6de0cfda31e99b077117fa802495d31821ab.tar.gz |
Backport commit 430eb2f85 from Emacs
* lisp/org.el (org-org-menu, org-create-customize-menu):
Remove Emacs 20 compat code.
Remove Emacs 20 compat code from org.el
430eb2f850b26f7df8473de4d929b5665673a0a2
Stefan Kangas
Fri Nov 20 16:11:33 2020 +0100
-rw-r--r-- | lisp/org.el | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/lisp/org.el b/lisp/org.el index 091787c..32d404a 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -18196,8 +18196,7 @@ an argument, unconditionally call `org-insert-heading'." ("Customize" ["Browse Org Group" org-customize t] "--" - ["Expand This Menu" org-create-customize-menu - (fboundp 'customize-menu-create)]) + ["Expand This Menu" org-create-customize-menu t]) ["Send bug report" org-submit-bug-report t] "--" ("Refresh/Reload" @@ -18443,20 +18442,17 @@ With prefix arg UNCOMPILED, load the uncompiled versions." (interactive) (org-load-modules-maybe) (org-require-autoloaded-modules) - (if (fboundp 'customize-menu-create) - (progn - (easy-menu-change - '("Org") "Customize" - `(["Browse Org group" org-customize t] - "--" - ,(customize-menu-create 'org) - ["Set" Custom-set t] - ["Save" Custom-save t] - ["Reset to Current" Custom-reset-current t] - ["Reset to Saved" Custom-reset-saved t] - ["Reset to Standard Settings" Custom-reset-standard t])) - (message "\"Org\"-menu now contains full customization menu")) - (error "Cannot expand menu (outdated version of cus-edit.el)"))) + (easy-menu-change + '("Org") "Customize" + `(["Browse Org group" org-customize t] + "--" + ,(customize-menu-create 'org) + ["Set" Custom-set t] + ["Save" Custom-save t] + ["Reset to Current" Custom-reset-current t] + ["Reset to Saved" Custom-reset-saved t] + ["Reset to Standard Settings" Custom-reset-standard t])) + (message "\"Org\"-menu now contains full customization menu")) ;;;; Miscellaneous stuff |