summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2016-02-21 19:30:13 +0100
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2016-02-21 20:21:48 +0100
commit2b3c72e231de4bd5f9f1d3ddfeff45c1edd901dd (patch)
tree375ad449ba28d8052cbbb6eef1e0510c9ce52fa6
parenta16eba2a022f74aac3e27dba33929108f2dd8b37 (diff)
downloadorg-mode-2b3c72e231de4bd5f9f1d3ddfeff45c1edd901dd.tar.gz
org-colview: Fix failing test
* lisp/org-colview.el (org-columns-new): Tiny refactoring. * testing/lisp/test-org-colview.el (test-org-colview/columns-new): Fix typo in test.
-rw-r--r--lisp/org-colview.el9
-rw-r--r--testing/lisp/test-org-colview.el2
2 files changed, 4 insertions, 7 deletions
diff --git a/lisp/org-colview.el b/lisp/org-colview.el
index 17e5e0b..65223d8 100644
--- a/lisp/org-colview.el
+++ b/lisp/org-colview.el
@@ -837,12 +837,9 @@ When COLUMNS-FMT-STRING is non-nil, use it as the column format."
(summarize (and prop operator (org-columns--summarize operator)))
(edit
(and prop (assoc-string prop org-columns-current-fmt-compiled t))))
- (cond (edit (setcdr edit (list title width operator nil summarize)))
- ((= (current-column) 0)
- (push (list prop title width operator nil summarize)
- org-columns-current-fmt-compiled))
- (t (push (list prop title width operator nil summarize)
- (nthcdr (current-column) org-columns-current-fmt-compiled))))
+ (if edit (setcdr edit (list title width operator nil summarize))
+ (push (list prop title width operator nil summarize)
+ (nthcdr (current-column) org-columns-current-fmt-compiled)))
(org-columns-store-format)
(org-columns-redo)))
diff --git a/testing/lisp/test-org-colview.el b/testing/lisp/test-org-colview.el
index 034fa49..a25c24b 100644
--- a/testing/lisp/test-org-colview.el
+++ b/testing/lisp/test-org-colview.el
@@ -534,7 +534,7 @@
(list (get-char-property (point) 'org-columns-key)
(get-char-property (1+ (point)) 'org-columns-key)))))
(should
- (equal '("ITEM" "FOO" "ITEM")
+ (equal '("ITEM" "FOO" "BAR")
(org-test-with-temp-text "* H"
(let ((org-columns-default-format "%ITEM %BAR")) (org-columns))
(forward-char)