ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2016-01-21 00:54:37 +01:00
parent 3142d139fa 0d53e5f9e8
commit d15cae7e0f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/org-colview.el
View File

@ -603,7 +603,7 @@ an integer, select that value."
(t (setq nval (car allowed)))))
(cond
((equal major-mode 'org-agenda-mode)
(org-columns-eval '(org-entry-put pom key nval))
(org-columns-eval `(org-entry-put ,pom ,key ,nval))
;; The following let preserves the current format, and makes sure
;; that in only a single file things need to be updated.
(let* ((org-agenda-overriding-columns-format org-columns-current-fmt)
@ -614,13 +614,13 @@ an integer, select that value."
(org-agenda-columns)))
(t
(let ((inhibit-read-only t))
(remove-text-properties (1- bol) eol '(read-only t))
(remove-text-properties (max (1- bol) (point-min)) eol '(read-only t))
(unwind-protect
(progn
(setq org-columns-overlays
(org-delete-all line-overlays org-columns-overlays))
(mapc 'delete-overlay line-overlays)
(org-columns-eval '(org-entry-put pom key nval)))
(org-columns-eval `(org-entry-put ,pom ,key ,nval)))
(org-columns-display-here)))
(org-move-to-column col)
(and (nth 3 (assoc-string key org-columns-current-fmt-compiled t))