Commit 430eb2f8 authored by Stefan Kangas's avatar Stefan Kangas

Remove Emacs 20 compat code from org.el

* lisp/org/org.el (org-org-menu, org-create-customize-menu):
Remove Emacs 20 compat code.
parent 8834776b
Pipeline #7859 failed with stage
in 120 minutes and 1 second
......@@ -18535,8 +18535,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"
......@@ -18709,20 +18708,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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment