diff options
| author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2018-03-23 23:32:00 +0100 |
|---|---|---|
| committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2018-03-23 23:32:00 +0100 |
| commit | 28977b719c4529e4f22d3e880b2989320ab3a9fb (patch) | |
| tree | b04718cb0ce3566e07047da190fd3840b261aaea | |
| parent | 2ddb26f95d6f2ef976d83cf8ab0e8220b8cffed0 (diff) | |
| parent | 143a87e45c6683d29aa6c98f6a83eeb86fcb1b2b (diff) | |
| download | org-mode-28977b719c4529e4f22d3e880b2989320ab3a9fb.tar.gz | |
Merge branch 'maint'
| -rw-r--r-- | lisp/org-macro.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/org-macro.el b/lisp/org-macro.el index 362a18f..48014a5 100644 --- a/lisp/org-macro.el +++ b/lisp/org-macro.el @@ -133,7 +133,7 @@ Templates are stored in buffer-local variable function installs the following ones: \"property\", \"time\". and, if the buffer is associated to a file, \"input-file\" and \"modification-time\"." - (let* ((templates (org-macro--collect-macros)) + (let* ((templates nil) (update-templates (lambda (cell) (let ((old-template (assoc (car cell) templates))) @@ -192,7 +192,7 @@ function installs the following ones: \"property\", (org-macro--counter-initialize) (funcall update-templates (cons "n" "(eval (org-macro--counter-increment $1 $2))")) - (setq org-macro-templates templates))) + (setq org-macro-templates (nconc (org-macro--collect-macros) templates)))) (defun org-macro-expand (macro templates) "Return expanded MACRO, as a string. |