forked from mirrors/org-mode
Merge branch 'maint'
This commit is contained in:
commit
6e5399d54f
28
lisp/org.el
28
lisp/org.el
|
@ -18212,8 +18212,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"
|
||||
|
@ -18459,20 +18458,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
|
||||
|
||||
|
|
|
@ -4240,7 +4240,7 @@ Return output file's name."
|
|||
`((?i . ,(shell-quote-argument in-file))
|
||||
(?I . ,(browse-url-file-url in-file))
|
||||
(?f . ,out-fmt)
|
||||
(?o . ,out-file)
|
||||
(?o . ,(shell-quote-argument out-file))
|
||||
(?O . ,(browse-url-file-url out-file))
|
||||
(?d . , (shell-quote-argument out-dir))
|
||||
(?D . ,(browse-url-file-url out-dir))
|
||||
|
|
Loading…
Reference in a new issue