Merge branch 'maint'

This commit is contained in:
Kyle Meyer 2019-12-09 05:34:03 -05:00
commit 5f2247f2fe
1 changed files with 1 additions and 1 deletions

View File

@ -6929,7 +6929,7 @@ options as CDR."
(org-export--dispatch-ui options first-key expertp))
;; q key at first level aborts export. At second level, cancel
;; first key instead.
((eq key ?q) (if (not first-key) (error "Export aborted")
((eq key ?q) (if (not first-key) (user-error "Export aborted")
(org-export--dispatch-ui options nil expertp)))
;; Help key: Switch back to standard interface if expert UI was
;; active.