0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-07-15 18:46:26 +00:00

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2013-07-18 15:57:15 +02:00
commit 3386033165

View file

@ -153,13 +153,16 @@ When completing for #+STARTUP, for example, this function returns
(mapcar (lambda (keyword) (concat keyword ": ")) (mapcar (lambda (keyword) (concat keyword ": "))
org-element-affiliated-keywords) org-element-affiliated-keywords)
(let (block-names) (let (block-names)
(mapc (lambda (block-name) (dolist (block-info org-element-block-name-alist block-names)
(let ((name (car block-name))) (let ((name (car block-info)))
(push (format "END_%s " name) block-names) (push (format "END_%s" name) block-names)
(push (format "BEGIN_%s " name) block-names) (push (concat "BEGIN_"
(push (format "ATTR_%s: " name) block-names))) name
org-element-block-name-alist) ;; Since language is compulsory in
;; source blocks, add a space.
(and (equal name "SRC") " "))
block-names) block-names)
(push (format "ATTR_%s: " name) block-names))))
(mapcar (lambda (keyword) (concat keyword ": ")) (mapcar (lambda (keyword) (concat keyword ": "))
(org-get-export-keywords)))) (org-get-export-keywords))))
(substring pcomplete-stub 2))) (substring pcomplete-stub 2)))