From 613c9a5c1f3237fbdc3a3db2341c7c59353d2aa2 Mon Sep 17 00:00:00 2001 From: Rasmus Date: Tue, 27 Mar 2018 23:34:41 +0200 Subject: Update Org to v9.1.9 Please note this is a bugfix release. See etc/ORG-NEWS for details. --- lisp/org/org-macro.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lisp/org/org-macro.el') diff --git a/lisp/org/org-macro.el b/lisp/org/org-macro.el index 0fb0b8ad175..1033db2af46 100644 --- a/lisp/org/org-macro.el +++ b/lisp/org/org-macro.el @@ -130,7 +130,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))) @@ -164,7 +164,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. -- cgit v1.2.3