浏览代码

Free up the `C-c C-v' key for Org Babel

TODO sparse trees are also accessible with `C-c / t'.
Carsten Dominik 15 年之前
父节点
当前提交
3d8b6de2ad
共有 3 个文件被更改,包括 9 次插入12 次删除
  1. 3 5
      doc/org.texi
  2. 4 4
      doc/orgguide.texi
  3. 2 3
      lisp/org.el

+ 3 - 5
doc/org.texi

@@ -3274,10 +3274,8 @@ mostly if more than two TODO states are possible (@pxref{TODO
 extensions}).  See also @ref{Conflicts}, for a discussion of the interaction
 extensions}).  See also @ref{Conflicts}, for a discussion of the interaction
 with @code{shift-selection-mode}.  See also the variable
 with @code{shift-selection-mode}.  See also the variable
 @code{org-treat-S-cursor-todo-selection-as-state-change}.
 @code{org-treat-S-cursor-todo-selection-as-state-change}.
-@kindex C-c C-v
 @kindex C-c / t
 @kindex C-c / t
 @cindex sparse tree, for TODO
 @cindex sparse tree, for TODO
-@item C-c C-v
 @itemx C-c / t
 @itemx C-c / t
 @vindex org-todo-keywords
 @vindex org-todo-keywords
 View TODO items in a @emph{sparse tree} (@pxref{Sparse trees}).  Folds the
 View TODO items in a @emph{sparse tree} (@pxref{Sparse trees}).  Folds the
@@ -3387,10 +3385,10 @@ select the right type for a task.  But when you return to the item after some
 time and execute @kbd{C-c C-t} again, it will switch from any name directly
 time and execute @kbd{C-c C-t} again, it will switch from any name directly
 to DONE.  Use prefix arguments or completion to quickly select a specific
 to DONE.  Use prefix arguments or completion to quickly select a specific
 name.  You can also review the items of a specific TODO type in a sparse tree
 name.  You can also review the items of a specific TODO type in a sparse tree
-by using a numeric prefix to @kbd{C-c C-v}.  For example, to see all things
-Lucy has to do, you would use @kbd{C-3 C-c C-v}.  To collect Lucy's items
+by using a numeric prefix to @kbd{C-c / t}.  For example, to see all things
+Lucy has to do, you would use @kbd{C-3 C-c / t}.  To collect Lucy's items
 from all agenda files into a single buffer, you would use the numeric prefix
 from all agenda files into a single buffer, you would use the numeric prefix
-argument as well when creating the global TODO list: @kbd{C-3 C-c t}.
+argument as well when creating the global TODO list: @kbd{C-3 C-c a t}.
 
 
 @node Multiple sets in one file, Fast access to TODO states, TODO types, TODO extensions
 @node Multiple sets in one file, Fast access to TODO states, TODO types, TODO extensions
 @subsection Multiple keyword sets in one file
 @subsection Multiple keyword sets in one file

+ 4 - 4
doc/orgguide.texi

@@ -142,8 +142,8 @@ Hyperlinks
 
 
 TODO Items
 TODO Items
 
 
-* Using TODO states::		
-* Multi-state workflows::	
+* Using TODO states::		Setting and switching states
+* Multi-state workflows::	More than just on/off
 * Progress logging::		Dates and notes for progress
 * Progress logging::		Dates and notes for progress
 * Priorities::			Some things are more important than others
 * Priorities::			Some things are more important than others
 * Breaking down tasks::		Splitting a task into manageable pieces
 * Breaking down tasks::		Splitting a task into manageable pieces
@@ -860,8 +860,8 @@ throughout your notes file.  Org mode compensates for this by providing
 methods to give you an overview of all the things that you have to do.
 methods to give you an overview of all the things that you have to do.
 
 
 @menu
 @menu
-* Using TODO states::		
-* Multi-state workflows::	
+* Using TODO states::		Setting and switching states
+* Multi-state workflows::	More than just on/off
 * Progress logging::		Dates and notes for progress
 * Progress logging::		Dates and notes for progress
 * Priorities::			Some things are more important than others
 * Priorities::			Some things are more important than others
 * Breaking down tasks::		Splitting a task into manageable pieces
 * Breaking down tasks::		Splitting a task into manageable pieces

+ 2 - 3
lisp/org.el

@@ -15618,7 +15618,6 @@ with a description part will be inlined."
 (org-defkey org-mode-map "\C-c\C-s" 'org-schedule)
 (org-defkey org-mode-map "\C-c\C-s" 'org-schedule)
 (org-defkey org-mode-map "\C-c\C-d" 'org-deadline)
 (org-defkey org-mode-map "\C-c\C-d" 'org-deadline)
 (org-defkey org-mode-map "\C-c;"    'org-toggle-comment)
 (org-defkey org-mode-map "\C-c;"    'org-toggle-comment)
-(org-defkey org-mode-map "\C-c\C-v" 'org-show-todo-tree)
 (org-defkey org-mode-map "\C-c\C-w" 'org-refile)
 (org-defkey org-mode-map "\C-c\C-w" 'org-refile)
 (org-defkey org-mode-map "\C-c/"    'org-sparse-tree)   ; Minor-mode reserved
 (org-defkey org-mode-map "\C-c/"    'org-sparse-tree)   ; Minor-mode reserved
 (org-defkey org-mode-map "\C-c\\"   'org-match-sparse-tree) ; Minor-mode res.
 (org-defkey org-mode-map "\C-c\\"   'org-match-sparse-tree) ; Minor-mode res.
@@ -16870,8 +16869,8 @@ See the individual commands for more information."
       ["Complete Keyword" org-complete (assq :todo-keyword (org-context))]
       ["Complete Keyword" org-complete (assq :todo-keyword (org-context))]
       ["Next keyword set" org-shiftcontrolright (and (> (length org-todo-sets) 1) (org-on-heading-p))]
       ["Next keyword set" org-shiftcontrolright (and (> (length org-todo-sets) 1) (org-on-heading-p))]
       ["Previous keyword set" org-shiftcontrolright (and (> (length org-todo-sets) 1) (org-on-heading-p))])
       ["Previous keyword set" org-shiftcontrolright (and (> (length org-todo-sets) 1) (org-on-heading-p))])
-     ["Show TODO Tree" org-show-todo-tree t]
-     ["Global TODO list" org-todo-list t]
+     ["Show TODO Tree" org-show-todo-tree :active t :keys "C-c / t"]
+     ["Global TODO list" org-todo-list :active t :keys "C-c a t"]
      "--"
      "--"
      ["Enforce dependencies" (customize-variable 'org-enforce-todo-dependencies)
      ["Enforce dependencies" (customize-variable 'org-enforce-todo-dependencies)
       :selected org-enforce-todo-dependencies :style toggle :active t]
       :selected org-enforce-todo-dependencies :style toggle :active t]