diff options
author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2017-06-04 09:17:07 +0200 |
---|---|---|
committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2017-06-04 09:17:07 +0200 |
commit | faace6f05dea94cc0f0cbb884885e0f34ae33e11 (patch) | |
tree | 17eea7a953df5e4dab6f08ae7c780a9c2f8d6afb | |
parent | 355b0012d1d12d6de51fa800e886f7d1e60ab458 (diff) | |
download | org-mode-faace6f05dea94cc0f0cbb884885e0f34ae33e11.tar.gz |
Fix last commit
* lisp/org-agenda.el (org-agenda-mode):
* lisp/org.el (org-clone-local-variables): Fix match pattern.
-rw-r--r-- | lisp/org-agenda.el | 8 | ||||
-rw-r--r-- | lisp/org.el | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 1218d36..f90dd53 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -2134,7 +2134,7 @@ The following commands are available: (mapc #'make-local-variable org-agenda-local-vars) (dolist (elem save) (pcase elem - (`(,var ,val) ;ignore unbound variables + (`(,var . ,val) ;ignore unbound variables (when (and val (memq var org-agenda-local-vars)) (set var val)))))) (setq-local org-agenda-this-buffer-is-sticky t)) @@ -2163,9 +2163,9 @@ The following commands are available: (add-hook 'pre-command-hook 'org-unhighlight nil 'local) ;; Make sure properties are removed when copying text (add-hook 'filter-buffer-substring-functions - (lambda (fun start end delete) - (substring-no-properties (funcall fun start end delete))) - nil t) + (lambda (fun start end delete) + (substring-no-properties (funcall fun start end delete))) + nil t) (unless org-agenda-keep-modes (setq org-agenda-follow-mode org-agenda-start-with-follow-mode org-agenda-entry-text-mode org-agenda-start-with-entry-text-mode)) diff --git a/lisp/org.el b/lisp/org.el index f508bf3..6d545cd 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -9620,10 +9620,10 @@ auto-fill\\|normal-auto-fill\\|fill-paragraph\\|indent-\\)" Optional argument REGEXP selects variables to clone." (dolist (pair (buffer-local-variables from-buffer)) (pcase pair - (`(,name ,_) ;ignore unbound variables + (`(,name . ,value) ;ignore unbound variables (when (and (not (memq name org-unique-local-variables)) (or (null regexp) (string-match-p regexp (symbol-name name)))) - (set (make-local-variable name) (cdr pair))))))) + (set (make-local-variable name) value)))))) ;;;###autoload (defun org-run-like-in-org-mode (cmd) |