summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2013-01-01 22:49:16 (GMT)
committer Bastien Guerry <bzg@altern.org>2013-01-01 22:49:16 (GMT)
commitfb8ba17e69e1dfa8d06553bb5122abf849a6faf2 (patch)
treee851b810c1cb6d2f1fd9acbebcd969e4062a3f5e
parent2718888f8e4afcbecb608539b3f16414a7399d3d (diff)
parenta9ece57df80ecf3172a1145284b899dbce56bded (diff)
downloadorg-mode-fb8ba17e69e1dfa8d06553bb5122abf849a6faf2.zip
org-mode-fb8ba17e69e1dfa8d06553bb5122abf849a6faf2.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/org.el b/lisp/org.el
index d46b020..ce2de19 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -18485,7 +18485,7 @@ BEG and END default to the buffer boundaries."
("c" . org-cycle)
("C" . org-shifttab)
(" " . org-display-outline-path)
- (":" . org-columns)
+ ("=" . org-columns)
("Outline Structure Editing")
("U" . org-shiftmetaup)
("D" . org-shiftmetadown)
@@ -18510,7 +18510,7 @@ BEG and END default to the buffer boundaries."
("1" . (org-priority ?A))
("2" . (org-priority ?B))
("3" . (org-priority ?C))
- (";" . org-set-tags-command)
+ (":" . org-set-tags-command)
("e" . org-set-effort)
("E" . org-inc-effort)
("W" . (lambda(m) (interactive "sMinutes before warning: ")