Re: Re: keys and command name info

From: "Andreas Röhler" <andreas.roehler@easy-emacs.de>
To: emacs-orgmode <emacs-orgmode@gnu.org>
Subject: Re: Re: keys and command name info
Date: Thu, 29 Jul 2010 15:47:16 +0200	[thread overview]
Message-ID: <4C518664.4040506@easy-emacs.de> (raw)
In-Reply-To: <87zkxa7pmo.fsf@member.fsf.org>

[-- Attachment #1: Type: text/plain, Size: 3083 bytes --]

Am 29.07.2010 08:45, schrieb Tassilo Horn:
> Andreas Röhler<andreas.roehler@easy-emacs.de>  writes:
>
> Hi Andreas,
>
>> what about delivering mnemonic command names alongside with its keys
>> in org-info?
>
> That would be good practice, and I think it's more or less standard for
> emacs packages.  For example, that is from Gnus:
>
> ,----[ (info "(gnus)Summary Post Commands") ]
> | `S p'
> | `a'
> |      Prepare for posting an article (`gnus-summary-post-news').  By
> |      default, post to the current group.  If given a prefix, disable
> |      that.  If the prefix is 1, prompt for another group instead.
> |
> | `S f'
> | `f'
> |      Post a followup to the current article (`gnus-summary-followup').
> `----
>
>> 8.1. Agenda files
>>
>> [ ... ]
>> `C-c ['
>>       Add current file to the list of agenda files.  The file is added to
>>       the front of the list.  If it was already in the list, it is moved
>>       to the front.  With prefix arg, file is added/moved to the end.
>>
>> might be provided as
>>
>> 8.1. Agenda files
>>
>> [ ... ]
>> `C-c [', org-agenda-file-to-front
>>       Add current file to the list of agenda files.  The file is added to
>>       the front of the list.  If it was already in the list, it is moved
>>       to the front.  With prefix arg, file is added/moved to the end.
>
> I'd write it in parens with the usual function markup at the end of the
> first sentence, just like it's done in Gnus.  The 2 Gnus entries above
> have this definition:
>
> --8<---------------cut here---------------start------------->8---
> @table @kbd
> @item S p
> @itemx a
> @kindex a (Summary)
> @kindex S p (Summary)
> @findex gnus-summary-post-news
> @c @icon{gnus-summary-post-news}
> Prepare for posting an article (@code{gnus-summary-post-news}).  By
> default, post to the current group.  If given a prefix, disable that.
> If the prefix is 1, prompt for another group instead.
>
> @item S f
> @itemx f
> @kindex f (Summary)
> @kindex S f (Summary)
> @findex gnus-summary-followup
> @c @icon{gnus-summary-followup}
> Post a followup to the current article (@code{gnus-summary-followup}).
> --8<---------------cut here---------------end--------------->8---
>
> So basically, you only have to add the command name with @code{} at the
> appropriate place and add an index item to the function index with
> @findex{}.
>
>> IMHO it's useful for emacs-beginners, but for hackers too, as
>> remembering function names may precede remembering keys - which are to
>> change individually anyway.
>
> Exactly, and using `C-h f' you can easily switch to *Help* to lookup the
> exact docstring and signature.  And from *Help*, the function definition
> is only one click away.
>
>> Should you be interested, I'll consider to take action with
>> texi-files.
>
> I'd welcome such an enhancement to the docs, and I'm pretty sure nobody
> will object. :-)
>
> Bye,
> Tassilo
>

Fine.

Attached a patch against latest org-texi, starting that kind of work.

Please not I signed the FSF-disclaimer but not the paper transferring 
copyright under US-law.

Andreas



[-- Attachment #2: org-texi.patch --]
[-- Type: text/x-patch, Size: 36752 bytes --]

diff --git a/doc/org.texi b/doc/org.texi
index 38fd4b9..1928419 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -928,7 +928,7 @@ tables, @kbd{S-@key{TAB}} jumps to the previous field.
 @item C-u C-u C-u @key{TAB}
 Show all, including drawers.
 @kindex C-c C-r
-@item C-c C-r
+@item C-c C-r, (@code{org-reveal})
 Reveal context around point, showing the current entry, the following heading
 and the hierarchy above.  Useful for working near a location that has been
 exposed by a sparse tree command (@pxref{Sparse trees}) or an agenda command
@@ -936,10 +936,10 @@ exposed by a sparse tree command (@pxref{Sparse trees}) or an agenda command
 level, all sibling headings.  With double prefix arg, also show the entire
 subtree of the parent.
 @kindex C-c C-k
-@item C-c C-k
+@item C-c C-k, (@code{org-kill-note-or-show-branches})
 Expose all the headings of the subtree, CONTENT view for just one subtree.
 @kindex C-c C-x b
-@item C-c C-x b
+@item C-c C-x b, (@code{org-tree-to-indirect-buffer})
 Show the current subtree in an indirect buffer@footnote{The indirect
 buffer
 @ifinfo
@@ -1004,16 +1004,16 @@ Next heading.
 @item C-c C-p
 Previous heading.
 @kindex C-c C-f
-@item C-c C-f
+@item C-c C-f, (@code{org-forward-same-level})
 Next heading same level.
 @kindex C-c C-b
-@item C-c C-b
+@item C-c C-b, (@code{org-backward-same-level})
 Previous heading same level.
 @kindex C-c C-u
 @item C-c C-u
 Backward to higher level heading.
 @kindex C-c C-j
-@item C-c C-j
+@item C-c C-j, (@code{org-goto})
 Jump to a different place without changing the current outline
 visibility.  Shows the document structure in a temporary buffer, where
 you can use the following keys to find your destination:
@@ -1106,15 +1106,15 @@ level).
 @item M-S-@key{down}
 Move subtree down (swap with next subtree of same level).
 @kindex C-c C-x C-w
-@item C-c C-x C-w
+@item C-c C-x C-w, (@code{org-cut-special})
 Kill subtree, i.e. remove it from buffer but save in kill ring.
 With a numeric prefix argument N, kill N sequential subtrees.
 @kindex C-c C-x M-w
-@item C-c C-x M-w
+@item C-c C-x M-w, (@code{org-copy-special})
 Copy subtree to kill ring.  With a numeric prefix argument N, copy the N
 sequential subtrees.
 @kindex C-c C-x C-y
-@item C-c C-x C-y
+@item C-c C-x C-y, (@code{org-paste-special})
 Yank subtree from kill ring.  This does modify the level of the subtree to
 make sure the tree fits in nicely at the yank position.  The yank level can
 also be specified with a numeric prefix argument, or by yanking after a
@@ -1134,7 +1134,7 @@ force a normal yank is @kbd{C-u C-y}.  If you use @code{yank-pop} after a
 yank, it will yank previous kill items plainly, without adjustment and
 folding.
 @kindex C-c C-x c
-@item C-c C-x c
+@item C-c C-x c, (@code{org-clone-subtree-with-time-shift})
 Clone a subtree by making a number of sibling copies of it.  You will be
 prompted for the number of copies to make, and you can also specify if any
 timestamps in the entry should be shifted.  This can be useful, for example,
@@ -1142,10 +1142,10 @@ to create a number of tasks related to a series of lectures to prepare.  For
 more details, see the docstring of the command
 @code{org-clone-subtree-with-time-shift}.
 @kindex C-c C-w
-@item C-c C-w
+@item C-c C-w, (@code{org-refile})
 Refile entry or region to a different location.  @xref{Refiling notes}.
 @kindex C-c ^
-@item C-c ^
+@item C-c ^, (@code{org-sort})
 Sort same-level entries.  When there is an active region, all entries in the
 region will be sorted.  Otherwise the children of the current headline are
 sorted.  The command prompts for the sorting method, which can be
@@ -1163,7 +1163,7 @@ Narrow buffer to current subtree.
 @item C-x n w
 Widen buffer to remove narrowing.
 @kindex C-c *
-@item C-c *
+@item C-c *, (@code{org-ctrl-c-star})
 Turn a normal line or plain list item into a headline (so that it becomes a
 subheading at its location).  Also turn a headline into a normal line by
 removing the stars.  If there is an active region, turn all lines in the
@@ -1209,7 +1209,7 @@ commands can be accessed through a dispatcher:
 
 @table @kbd
 @kindex C-c /
-@item C-c /
+@item C-c /, (@code{org-sparse-tree})
 This prompts for an extra key to select a sparse-tree creating command.
 @kindex C-c / r
 @item C-c / r
@@ -1401,13 +1401,13 @@ the initially selected region is used, even if the new indentation
 would imply a different hierarchy.  To use the new hierarchy, break
 the command chain with a cursor motion or so.
 @kindex C-c C-c
-@item C-c C-c
+@item C-c C-c, (@code{org-ctrl-c-ctrl-c})
 If there is a checkbox (@pxref{Checkboxes}) in the item line, toggle the
 state of the checkbox.  If not, this command makes sure that all the
 items on this list level use the same bullet.  Furthermore, if this is
 an ordered list, make sure the numbering is OK.
 @kindex C-c -
-@item C-c -
+@item C-c -, (@code{org-ctrl-c-minus})
 Cycle the entire list level through the different itemize/enumerate bullets
 (@samp{-}, @samp{+}, @samp{*}, @samp{1.}, @samp{1)}).  With a numeric prefix
 argument N, select the Nth bullet from this list.  If there is an active
@@ -1416,7 +1416,7 @@ first line already was a list item, any item markers will be removed from the
 list.  Finally, even without an active region, a normal line will be
 converted into a list item.
 @kindex C-c *
-@item C-c *
+@item C-c *, (@code{org-ctrl-c-star})
 Turn a plain list item into a headline (so that it becomes a subheading at
 its location). @xref{Structure editing}, for a detailed explanation.
 @kindex S-@key{left}
@@ -1427,7 +1427,7 @@ This command also cycles bullet styles when the cursor in on the bullet or
 anywhere in an item line, details depending on
 @code{org-support-shift-select}.
 @kindex C-c ^
-@item C-c ^
+@item C-c ^, (@code{org-sort})
 Sort the plain list.  You will be prompted for the sorting method:
 numerically, alphabetically, by time, or by custom function.
 @end table
@@ -1467,7 +1467,7 @@ done by state changes, use
 
 @table @kbd
 @kindex C-c C-z
-@item C-c C-z
+@item C-c C-z, (@code{org-add-note})
 Add a time-stamped note to the LOGBOOK drawer.
 @end table
 
@@ -1542,7 +1542,7 @@ for details.
 
 @table @kbd
 @kindex C-c C-x f
-@item C-c C-x f
+@item C-c C-x f, (@code{org-footnote-action})
 The footnote action command.
 
 When the cursor is on a footnote reference, jump to the definition.  When it
@@ -1586,7 +1586,7 @@ renumbering and sorting footnotes can be automatic after each insertion or
 deletion.
 
 @kindex C-c C-c
-@item C-c C-c
+@item C-c C-c, (@code{org-ctrl-c-ctrl-c})
 If the cursor is on a footnote reference, jump to the definition.  If it is a
 the definition, jump back to the reference.  When called at a footnote
 location with a prefix argument, offer the same menu as @kbd{C-c C-x f}.
@@ -1696,7 +1696,7 @@ unpredictable for you, configure the variables
 @table @kbd
 @tsubheading{Creation and conversion}
 @kindex C-c |
-@item C-c |
+@item C-c |, (@code{org-table-create-or-convert-from-region})
 Convert the active region to table. If every line contains at least one
 TAB character, the function assumes that the material is tab separated.
 If every line contains a comma, comma-separated values (CSV) are assumed.
@@ -1711,7 +1711,7 @@ table.  But it's easier just to start typing, like
 
 @tsubheading{Re-aligning and field motion}
 @kindex C-c C-c
-@item C-c C-c
+@item C-c C-c, (@code{org-ctrl-c-ctrl-c})
 Re-align the table without moving the cursor.
 @c
 @kindex @key{TAB}
@@ -1767,7 +1767,7 @@ Insert a new row above the current row.  With a prefix argument, the line is
 created below the current one.
 @c
 @kindex C-c -
-@item C-c -
+@item C-c -, (@code{org-ctrl-c-minus})
 Insert a horizontal line below current row.  With a prefix argument, the line
 is created above the current line.
 @c
@@ -1777,7 +1777,7 @@ Insert a horizontal line below current row, and move the cursor into the row
 below that line.
 @c
 @kindex C-c ^
-@item C-c ^
+@item C-c ^, (@code{org-sort})
 Sort the table lines in the region.  The position of point indicates the
 column to be used for sorting, and the range of lines is the range
 between the nearest horizontal separator lines, or the entire table.  If
@@ -1790,18 +1790,18 @@ argument, alphabetic sorting will be case-sensitive.
 
 @tsubheading{Regions}
 @kindex C-c C-x M-w
-@item C-c C-x M-w
+@item C-c C-x M-w, (@code{org-copy-special})
 Copy a rectangular region from a table to a special clipboard.  Point and
 mark determine edge fields of the rectangle.  If there is no active region,
 copy just the current field.  The process ignores horizontal separator lines.
 @c
 @kindex C-c C-x C-w
-@item C-c C-x C-w
+@item C-c C-x C-w, (@code{org-cut-special})
 Copy a rectangular region from a table to a special clipboard, and
 blank all fields in the rectangle.  So this is the ``cut'' operation.
 @c
 @kindex C-c C-x C-y
-@item C-c C-x C-y
+@item C-c C-x C-y, (@code{org-paste-special})
 Paste a rectangular region into a table.
 The upper left corner ends up in the current field.  All involved fields
 will be overwritten.  If the rectangle does not fit into the present table,
@@ -1826,7 +1826,7 @@ field is made blank, and the content is appended to the field above.
 @cindex active region
 @cindex transient mark mode
 @kindex C-c +
-@item C-c +
+@item C-c +, (@code{org-table-sum})
 Sum the numbers in the current column, or in the rectangle defined by
 the active region.  The result is shown in the echo area and can
 be inserted with @kbd{C-y}.
@@ -1844,7 +1844,7 @@ increment.  This key is also used by shift-selection and related modes
 
 @tsubheading{Miscellaneous}
 @kindex C-c `
-@item C-c `
+@item C-c `, (@code{org-table-edit-field})
 Edit the current field in a separate window.  This is useful for fields that
 are not fully visible (@pxref{Column width and alignment}).  When called with
 a @kbd{C-u} prefix, just make the full field visible, so that it can be
@@ -1858,7 +1858,7 @@ TAB-separated text files.  This command works by inserting the file into
 the buffer and then converting the region to a table.  Any prefix
 argument is passed on to the converter, which uses it to determine the
 separator.
-@item C-c |
+@item C-c |, (@code{org-table-create-or-convert-from-region})
 Tables can also be imported by pasting tabular text into the Org
 buffer, selecting the pasted text with @kbd{C-x C-x} and then using the
 @kbd{C-c |} command (see above under @i{Creation and conversion}).
@@ -2374,7 +2374,7 @@ following command:
 
 @table @kbd
 @kindex C-c =
-@item C-c =
+@item C-c =, (@code{org-table-eval-formula})
 Install a new formula for the current column and replace current field with
 the result of the formula.  The command prompts for a formula, with default
 taken from the @samp{#+TBLFM} line, applies it to the current field and
@@ -2399,7 +2399,7 @@ if possible.  If you prefer to only work with the internal format (like
 @table @kbd
 @kindex C-c =
 @kindex C-u C-c =
-@item C-c =
+@item C-c =, (@code{org-table-eval-formula})
 @itemx C-u C-c =
 Edit the formula associated with the current column/field in the
 minibuffer.  See @ref{Column formulas}, and @ref{Field formulas}.
@@ -2410,7 +2410,7 @@ field formula, or a column formula) into the current field, so that you
 can edit it directly in the field.  The advantage over editing in the
 minibuffer is that you can use the command @kbd{C-c ?}.
 @kindex C-c ?
-@item C-c ?
+@item C-c ?, (@code{org-table-field-info})
 While editing a formula in a table field, highlight the field(s)
 referenced by the reference at the cursor position in the formula.
 @kindex C-c @}
@@ -2422,7 +2422,7 @@ force it with @kbd{C-c C-c}.
 @item C-c @{
 Toggle the formula debugger on and off.  See below.
 @kindex C-c '
-@item C-c '
+@item C-c ', (@code{org-edit-special})
 Edit all formulas for the current table in a special buffer, where the
 formulas will be displayed one per line.  If the current field has an
 active formula, the cursor in the formula editor will mark it.
@@ -2432,15 +2432,15 @@ remove and add formulas, and use the following commands:
 @table @kbd
 @kindex C-c C-c
 @kindex C-x C-s
-@item C-c C-c
+@item C-c C-c, (@code{org-ctrl-c-ctrl-c})
 @itemx C-x C-s
 Exit the formula editor and store the modified formulas.  With @kbd{C-u}
 prefix, also apply the new formulas to the entire table.
 @kindex C-c C-q
-@item C-c C-q
+@item C-c C-q, (@code{org-set-tags-command})
 Exit the formula editor without installing changes.
 @kindex C-c C-r
-@item C-c C-r
+@item C-c C-r, (@code{org-reveal})
 Toggle all references in the formula editor between standard (like
 @code{B3}) and internal (like @code{@@3$2}).
 @kindex @key{TAB}
@@ -2510,7 +2510,7 @@ following commands:
 
 @table @kbd
 @kindex C-c *
-@item C-c *
+@item C-c *, (@code{org-ctrl-c-star})
 Recalculate the current row by first applying the stored column formulas
 from left to right, and all field formulas in the current row.
 @c
@@ -3002,7 +3002,7 @@ entry referenced by the current line.
 @cindex link completion
 @cindex completion, of links
 @cindex inserting links
-@item C-c C-l
+@item C-c C-l, (@code{org-insert-link})
 @vindex org-keep-stored-link-after-insertion
 Insert a link@footnote{ Note that you don't have to use this command to
 insert a link.  Links in Org are plain text, and you can type or paste them
@@ -3093,13 +3093,13 @@ be inlined during export.  When called with a prefix argument, also display
 images that do have a link description.
 @cindex mark ring
 @kindex C-c %
-@item C-c %
+@item C-c %, (@code{org-mark-ring-push})
 Push the current position onto the mark ring, to be able to return
 easily. Commands following an internal link do this automatically.
 @c
 @cindex links, returning to
 @kindex C-c &
-@item C-c &
+@item C-c &, (@code{org-mark-ring-goto})
 Jump back to a recorded position.  A position is recorded by the
 commands following internal links, and by @kbd{C-c %}.  Using this
 command several times in direct succession moves through a ring of
@@ -3108,7 +3108,7 @@ previously recorded positions.
 @kindex C-c C-x C-n
 @kindex C-c C-x C-p
 @cindex links, finding next/previous
-@item C-c C-x C-n
+@item C-c C-x C-n, (@code{org-next-link})
 @itemx C-c C-x C-p
 Move forward/backward to the next link in the buffer.  At the limit of
 the buffer, the search fails once, and then wraps around.  The key
@@ -3309,7 +3309,7 @@ The most important commands to work with TODO entries are:
 @table @kbd
 @kindex C-c C-t
 @cindex cycling, of TODO states
-@item C-c C-t
+@item C-c C-t, (@code{org-todo})
 Rotate the TODO state of the current item among
 
 @example
@@ -3636,7 +3636,7 @@ example:
 
 @table @kbd
 @kindex C-c C-x o
-@item C-c C-x o
+@item C-c C-x o, (@code{org-toggle-ordered-property})
 @vindex org-track-ordered-property-with-tag
 @cindex property, ORDERED
 Toggle the @code{ORDERED} property of the current entry.  A property is used
@@ -4075,12 +4075,12 @@ off a box while there are unchecked boxes above it.
 
 @table @kbd
 @kindex C-c C-c
-@item C-c C-c
+@item C-c C-c, (@code{org-ctrl-c-ctrl-c})
 Toggle checkbox status or (with prefix arg) checkbox presence at point.  With
 double prefix argument, set it to @samp{[-]}, which is considered to be an
 intermediate state.
 @kindex C-c C-x C-b
-@item C-c C-x C-b
+@item C-c C-x C-b, (@code{org-toggle-checkbox})
 Toggle checkbox status or (with prefix arg) checkbox presence at point.  With
 double prefix argument, set it to @samp{[-]}, which is considered to be an
 intermediate state.
@@ -4101,7 +4101,7 @@ Insert a new item with a checkbox.
 This works only if the cursor is already in a plain list item
 (@pxref{Plain lists}).
 @kindex C-c C-x o
-@item C-c C-x o
+@item C-c C-x o, (@code{org-toggle-ordered-property})
 @vindex org-track-ordered-property-with-tag
 @cindex property, ORDERED
 Toggle the @code{ORDERED} property of the entry, to toggle if checkboxes must
@@ -4111,7 +4111,7 @@ However, if you would like to @i{track} the value of this property with a tag
 for better visibility, customize the variable
 @code{org-track-ordered-property-with-tag}.
 @kindex C-c #
-@item C-c #
+@item C-c #, (@code{org-update-statistics-cookies})
 Update the statistics cookie in the current outline entry.  When called with
 a @kbd{C-u} prefix, update the entire file.  Checkbox statistic cookies are
 updated automatically if you toggle checkboxes with @kbd{C-c C-c} and make
@@ -4206,7 +4206,7 @@ also a special command for inserting tags:
 
 @table @kbd
 @kindex C-c C-q
-@item C-c C-q
+@item C-c C-q, (@code{org-set-tags-command})
 @cindex completion, of tags
 @vindex org-tags-column
 Enter new tags for the current headline.  Org-mode will either offer
@@ -4217,7 +4217,7 @@ tags in the current buffer will be aligned to that column, just to make
 things look nice.  TAGS are automatically realigned after promotion,
 demotion, and TODO state changes (@pxref{TODO basics}).
 @kindex C-c C-c
-@item C-c C-c
+@item C-c C-c, (@code{org-ctrl-c-ctrl-c})
 When the cursor is in a headline, this does the same as @kbd{C-c C-q}.
 @end table
 
@@ -4386,7 +4386,7 @@ information into special lists.
 @table @kbd
 @kindex C-c \
 @kindex C-c / m
-@item C-c \
+@item C-c \, (@code{org-match-sparse-tree})
 @itemx C-c / m
 Create a sparse tree with all headlines matching a tags search.  With a
 @kbd{C-u} prefix argument, ignore headlines that are not a TODO line.
@@ -4501,7 +4501,7 @@ The following commands help to work with properties:
 After an initial colon in a line, complete property keys.  All keys used
 in the current file will be offered as possible completions.
 @kindex C-c C-x p
-@item C-c C-x p
+@item C-c C-x p, (@code{org-set-property})
 Set a property.  This prompts for a property name and a value.  If
 necessary, the property drawer is created as well.
 @item M-x org-insert-property-drawer
@@ -4509,7 +4509,7 @@ Insert a property drawer into the current entry.  The drawer will be
 inserted early in the entry, but after the lines with planning
 information like deadlines.
 @kindex C-c C-c
-@item C-c C-c
+@item C-c C-c, (@code{org-ctrl-c-ctrl-c})
 With the cursor in a property drawer, this executes property commands.
 @item C-c C-c s
 Set a property in the current entry.  Both the property and the value
@@ -4579,7 +4579,7 @@ the same commands are used as for tag searches (@pxref{Tag searches}).
 @table @kbd
 @kindex C-c \
 @kindex C-c / m
-@item C-c \
+@item C-c \, (@code{org-match-sparse-tree})
 @itemx C-c / m
 Create a sparse tree with all matching entries.  With a
 @kbd{C-u} prefix argument, ignore headlines that are not a TODO line.
@@ -4815,7 +4815,7 @@ in the subtree.
 @table @kbd
 @tsubheading{Turning column view on and off}
 @kindex C-c C-x C-c
-@item C-c C-x C-c
+@item C-c C-x C-c, (@code{org-columns})
 @vindex org-columns-default-format
 Turn on column view.  If the cursor is before the first headline in the file,
 column view is turned on for the entire file, using the @code{#+COLUMNS}
@@ -4856,7 +4856,7 @@ invoke the same interface that you normally use to change that
 property.  For example, when editing a TAGS property, the tag completion
 or fast selection interface will pop up.
 @kindex C-c C-c
-@item C-c C-c
+@item C-c C-c, (@code{org-ctrl-c-ctrl-c})
 When there is a checkbox at point, toggle it.
 @kindex v
 @item v
@@ -4934,11 +4934,11 @@ The following commands insert or update the dynamic block:
 
 @table @kbd
 @kindex C-c C-x i
-@item C-c C-x i
+@item C-c C-x i, (@code{org-insert-columns-dblock})
 Insert a dynamic block capturing a column view.  You will be prompted
 for the scope or ID of the view.
 @kindex C-c C-c
-@item C-c C-c
+@item C-c C-c, (@code{org-ctrl-c-ctrl-c})
 @kindex C-c C-x C-u
 @itemx C-c C-x C-u
 Update dynamic block at point.  The cursor needs to be in the
@@ -5084,14 +5084,14 @@ format.
 
 @table @kbd
 @kindex C-c .
-@item C-c .
+@item C-c ., (@code{org-time-stamp})
 Prompt for a date and insert a corresponding timestamp.  When the cursor is
 at an existing timestamp in the buffer, the command is used to modify this
 timestamp instead of inserting a new one.  When this command is used twice in
 succession, a time range is inserted.
 @c
 @kindex C-c !
-@item C-c !
+@item C-c !, (@code{org-time-stamp-inactive})
 Like @kbd{C-c .}, but insert an inactive timestamp that will not cause
 an agenda entry.
 @c
@@ -5105,17 +5105,17 @@ contains date and time.  The default time can be rounded to multiples of 5
 minutes, see the option @code{org-time-stamp-rounding-minutes}.
 @c
 @kindex C-c <
-@item C-c <
+@item C-c <, (@code{org-date-from-calendar})
 Insert a timestamp corresponding to the cursor date in the Calendar.
 @c
 @kindex C-c >
-@item C-c >
+@item C-c >, (@code{org-goto-calendar})
 Access the Emacs calendar for the current date.  If there is a
 timestamp in the current line, go to the corresponding date
 instead.
 @c
 @kindex C-c C-o
-@item C-c C-o
+@item C-c C-o, (@code{org-open-at-point})
 Access the agenda for the date given by the timestamp or -range at
 point (@pxref{Weekly/daily agenda}).
 @c
@@ -5141,7 +5141,7 @@ related modes (@pxref{Conflicts}).
 @c
 @kindex C-c C-y
 @cindex evaluate time range
-@item C-c C-y
+@item C-c C-y, (@code{org-evaluate-time-range})
 Evaluate a time range by computing the difference between start and end.
 With a prefix argument, insert result after the time range (in a table: into
 the following column).
@@ -5278,7 +5278,7 @@ customizing the variables @code{org-display-custom-times} and
 
 @table @kbd
 @kindex C-c C-x C-t
-@item C-c C-x C-t
+@item C-c C-x C-t, (@code{org-toggle-time-stamp-overlays})
 Toggle the display of custom formats for dates and times.
 @end table
 
@@ -5395,7 +5395,7 @@ an item:
 @table @kbd
 @c
 @kindex C-c C-d
-@item C-c C-d
+@item C-c C-d, (@code{org-deadline})
 Insert @samp{DEADLINE} keyword along with a stamp.  The insertion will happen
 in the line directly following the headline.  When called with a prefix arg,
 an existing deadline will be removed from the entry.  Depending on the
@@ -5406,7 +5406,7 @@ deadline.
 @c FIXME Any CLOSED timestamp will be removed.????????
 @c
 @kindex C-c C-s
-@item C-c C-s
+@item C-c C-s, (@code{org-schedule})
 Insert @samp{SCHEDULED} keyword along with a stamp.  The insertion will
 happen in the line directly following the headline.  Any CLOSED timestamp
 will be removed.  When called with a prefix argument, remove the scheduling
@@ -5419,7 +5419,7 @@ scheduling time.
 @kindex C-c C-x C-k
 @kindex k a
 @kindex k s
-@item C-c C-x C-k
+@item C-c C-x C-k, (@code{org-mark-entry-for-agenda-action})
 Mark the current entry for agenda action.  After you have marked the entry
 like this, you can open the agenda or the calendar to find an appropriate
 date.  With the cursor on the selected date, press @kbd{k s} or @kbd{k d} to
@@ -5581,7 +5581,7 @@ show all time clocked on this tasks today (see also the variable
 @code{org-clock-modeline-total}.}.@* Clicking with @kbd{mouse-1} onto the
 mode line entry will pop up a menu with clocking options.
 @kindex C-c C-x C-o
-@item C-c C-x C-o
+@item C-c C-x C-o, (@code{org-clock-out})
 @vindex org-log-note-clock-out
 Stop the clock (clock-out).  This inserts another timestamp at the same
 location where the clock was last started.  It also directly computes
@@ -5600,20 +5600,20 @@ Recompute the time interval after changing one of the timestamps.  This
 is only necessary if you edit the timestamps directly.  If you change
 them with @kbd{S-@key{cursor}} keys, the update is automatic.
 @kindex C-c C-t
-@item C-c C-t
+@item C-c C-t, (@code{org-todo})
 Changing the TODO state of an item to DONE automatically stops the clock
 if it is running in this same item.
 @kindex C-c C-x C-x
-@item C-c C-x C-x
+@item C-c C-x C-x, (@code{org-clock-cancel})
 Cancel the current clock.  This is useful if a clock was started by
 mistake, or if you ended up working on something else.
 @kindex C-c C-x C-j
-@item C-c C-x C-j
+@item C-c C-x C-j, (@code{org-clock-goto})
 Jump to the entry that contains the currently running clock.  With a
 @kbd{C-u} prefix arg, select the target task from a list of recently clocked
 tasks.
 @kindex C-c C-x C-d
-@item C-c C-x C-d
+@item C-c C-x C-d, (@code{org-clock-display})
 @vindex org-remove-highlights-with-change
 Display time summaries for each subtree in the current buffer.  This
 puts overlays at the end of each headline, showing the total time
@@ -5622,7 +5622,7 @@ can use visibility cycling to study the tree, but the overlays disappear
 when you change the buffer (see variable
 @code{org-remove-highlights-with-change}) or press @kbd{C-c C-c}.
 @kindex C-c C-x C-r
-@item C-c C-x C-r
+@item C-c C-x C-r, (@code{org-clock-report})
 Insert a dynamic block (@pxref{Dynamic blocks}) containing a clock
 report as an Org-mode table into the current file.  When the cursor is
 at an existing clock table, just update it.  When called with a prefix
@@ -5696,7 +5696,7 @@ A summary of the current subtree with % times would be
 #+END: clocktable
 @end example
 @kindex C-c C-c
-@item C-c C-c
+@item C-c C-c, (@code{org-ctrl-c-ctrl-c})
 @kindex C-c C-x C-u
 @itemx C-c C-x C-u
 Update dynamic block at point.  The cursor needs to be in the
@@ -5803,7 +5803,7 @@ for an entry with the following commands:
 
 @table @kbd
 @kindex C-c C-x e
-@item C-c C-x e
+@item C-c C-x e, (@code{org-set-effort})
 Set the effort estimate for the current entry.  With a numeric prefix
 argument, set it to the NTH allowed value (see below).  This command is also
 accessible from the agenda with the @kbd{e} key.
@@ -5861,12 +5861,12 @@ such a relative timer and make it easy to create timed notes.
 
 @table @kbd
 @kindex C-c C-x .
-@item C-c C-x .
+@item C-c C-x ., (@code{org-timer})
 Insert a relative time into the buffer.  The first time you use this, the
 timer will be started.  When called with a prefix argument, the timer is
 restarted.
 @kindex C-c C-x -
-@item C-c C-x -
+@item C-c C-x -, (@code{org-timer-item})
 Insert a description list item with the current relative time.  With a prefix
 argument, first reset the timer to 0.
 @kindex M-@key{RET}
@@ -5882,7 +5882,7 @@ Pause the timer, or continue it if it is already paused.
 Stop the timer.  After this, you can only start a new timer, not continue the
 old one.  This command also removes the timer from the mode line.
 @kindex C-c C-x 0
-@item C-c C-x 0
+@item C-c C-x 0, (@code{org-timer-start})
 Reset the timer without inserting anything into the buffer.  By default, the
 timer is reset to 0.  When called with a @kbd{C-u} prefix, reset the timer to
 specific starting offset.  The user is prompted for the offset, with a
@@ -5969,18 +5969,18 @@ into the target file and switch to an indirect buffer narrowed to this new
 node.  You may then insert the information you want.
 
 @kindex C-c C-c
-@item C-c C-c
+@item C-c C-c, (@code{org-ctrl-c-ctrl-c})
 Once you have finished entering information into the capture buffer, 
 @kbd{C-c C-c} will return you to the window configuration before the capture
 process, so that you can resume your work without further distraction.
 
 @kindex C-c C-w
-@item C-c C-w
+@item C-c C-w, (@code{org-refile})
 Finalize the capture process by refiling (@pxref{Refiling notes}) the note to
 a different place.
 
 @kindex C-c C-k
-@item C-c C-k
+@item C-c C-k, (@code{org-kill-note-or-show-branches})
 Abort the capture process and return to the previous state.
 @end table
 
@@ -6259,7 +6259,7 @@ directory.
 @table @kbd
 
 @kindex C-c C-a
-@item C-c C-a
+@item C-c C-a, (@code{org-attach})
 The dispatcher for commands related to the attachment system.  After these
 keys, a list of commands is displayed and you must press an additional key
 to select a command:
@@ -6358,11 +6358,11 @@ the following command is used:
 
 @table @kbd
 @kindex C-c C-x g
-@item C-c C-x g
+@item C-c C-x g, (@code{org-feed-update-all})
 Collect items from the feeds configured in @code{org-feed-alist} and act upon
 them.
 @kindex C-c C-x G
-@item C-c C-x G
+@item C-c C-x G, (@code{org-feed-goto-inbox})
 Prompt for a feed name and go to the inbox configured for this feed.
 @end table
 
@@ -6403,7 +6403,7 @@ process, you can use the following special command:
 
 @table @kbd
 @kindex C-c C-w
-@item C-c C-w
+@item C-c C-w, (@code{org-refile})
 @vindex org-reverse-note-order
 @vindex org-refile-targets
 @vindex org-refile-use-outline-path
@@ -6453,7 +6453,7 @@ searches like the construction of agenda views fast.
 
 @table @kbd
 @kindex C-c C-x C-a
-@item C-c C-x C-a
+@item C-c C-x C-a, (@code{org-archive-subtree-default})
 @vindex org-archive-default-command
 Archive the current entry using the command specified in the variable
 @code{org-archive-default-command}.
@@ -6563,7 +6563,7 @@ The following commands help manage the ARCHIVE tag:
 
 @table @kbd
 @kindex C-c C-x a
-@item C-c C-x a
+@item C-c C-x a, (@code{org-toggle-archive-tag})
 Toggle the ARCHIVE tag for the current headline.  When the tag is set,
 the headline changes to a shadowed face, and the subtree below it is
 hidden.
@@ -6578,7 +6578,7 @@ level 1 trees will be checked.
 @item C-@kbd{TAB}
 Cycle a tree even if it is tagged with ARCHIVE.
 @kindex C-c C-x A
-@item C-c C-x A
+@item C-c C-x A, (@code{org-archive-to-archive-sibling})
 Move the current entry to the @emph{Archive Sibling}.  This is a sibling of
 the entry with the heading @samp{Archive} and the tag @samp{ARCHIVE}.  The
 entry becomes a child of that sibling and in this way retains a lot of its
@@ -6672,12 +6672,12 @@ the easiest way to maintain it is through the following commands
 @cindex files, adding to agenda list
 @table @kbd
 @kindex C-c [
-@item C-c [
+@item C-c [, (@code{org-agenda-file-to-front})
 Add current file to the list of agenda files.  The file is added to
 the front of the list.  If it was already in the list, it is moved to
 the front.  With a prefix argument, file is added/moved to the end.
 @kindex C-c ]
-@item C-c ]
+@item C-c ], (@code{org-remove-file})
 Remove current file from the list of agenda files.
 @kindex C-,
 @kindex C-'
@@ -6703,7 +6703,7 @@ extended period, use the following commands:
 
 @table @kbd
 @kindex C-c C-x <
-@item C-c C-x <
+@item C-c C-x <, (@code{org-agenda-set-restriction-lock})
 Permanently restrict the agenda to the current subtree.  When with a
 prefix argument, or with the cursor before the first headline in a file,
 the agenda scope is set to the entire file.  This restriction remains in
@@ -6711,7 +6711,7 @@ effect until removed with @kbd{C-c C-x >}, or by typing either @kbd{<}
 or @kbd{>} in the agenda dispatcher.  If there is a window displaying an
 agenda view, the new restriction takes effect immediately.
 @kindex C-c C-x >
-@item C-c C-x >
+@item C-c C-x >, (@code{org-agenda-remove-restriction-lock})
 Remove the permanent restriction created by @kbd{C-c C-x <}.
 @end table
 
@@ -7435,14 +7435,14 @@ agenda buffers can be set with the variable
 @code{org-agenda-start-with-follow-mode}.
 @c
 @kindex C-c C-x b
-@item C-c C-x b
+@item C-c C-x b, (@code{org-tree-to-indirect-buffer})
 Display the entire subtree of the current item in an indirect buffer.  With a
 numeric prefix argument N, go up to level N and then take that tree.  If N is
 negative, go up that many levels.  With a @kbd{C-u} prefix, do not remove the
 previously used indirect buffer.
 
 @kindex C-c C-o
-@item C-c C-o
+@item C-c C-o, (@code{org-open-at-point})
 Follow a link in the entry.  This will offer a selection of any links in the
 text belonging to the referenced Org node.  If there is only one link, it
 will be followed without a selection prompt.
@@ -7574,7 +7574,7 @@ Save all Org buffers in the current Emacs session, and also the locations of
 IDs.
 @c
 @kindex C-c C-x C-c
-@item C-c C-x C-c
+@item C-c C-x C-c, (@code{org-columns})
 @vindex org-columns-default-format
 Invoke column view (@pxref{Column view}) in the agenda buffer.  The column
 view format is taken from the entry at point, or (if there is no entry at
@@ -7584,7 +7584,7 @@ that entry would be in the original buffer (taken from a property, from a
 @code{org-columns-default-format}), will be used in the agenda.
 
 @kindex C-c C-x >
-@item C-c C-x >
+@item C-c C-x >, (@code{org-agenda-remove-restriction-lock})
 Remove the restriction lock on the agenda, if it is currently restricted to a
 file or subtree (@pxref{Agenda files}).
 
@@ -7717,7 +7717,7 @@ is longer than one line, the kill needs to be confirmed by the user.  See
 variable @code{org-agenda-confirm-kill}.
 @c
 @kindex C-c C-w
-@item C-c C-w
+@item C-c C-w, (@code{org-refile})
 Refile the entry at point.
 @c
 @kindex C-c C-x C-a
@@ -7729,11 +7729,11 @@ archiving command set in @code{org-archive-default-command}.  When using the
 @code{a} key, confirmation will be required.
 @c
 @kindex C-c C-x a
-@item C-c C-x a
+@item C-c C-x a, (@code{org-toggle-archive-tag})
 Toggle the ARCHIVE tag for the current headline.
 @c
 @kindex C-c C-x A
-@item C-c C-x A
+@item C-c C-x A, (@code{org-archive-to-archive-sibling})
 Move the subtree corresponding to the current entry to its @emph{archive
 sibling}.
 @c
@@ -7789,15 +7789,15 @@ same location where state change notes are put.  Depending on
 @code{org-log-into-drawer}, this maybe inside a drawer.
 @c
 @kindex C-c C-a
-@item C-c C-a
+@item C-c C-a, (@code{org-attach})
 Dispatcher for all command related to attachments.
 @c
 @kindex C-c C-s
-@item C-c C-s
+@item C-c C-s, (@code{org-schedule})
 Schedule this item, with prefix arg remove the scheduling timestamp
 @c
 @kindex C-c C-d
-@item C-c C-d
+@item C-c C-d, (@code{org-deadline})
 Set a deadline for this item, with prefix arg remove the deadline.
 @c
 @kindex k
@@ -8317,7 +8317,7 @@ collected by certain criteria.
 
 @table @kbd
 @kindex C-c C-x C-c
-@item C-c C-x C-c
+@item C-c C-x C-c, (@code{org-columns})
 Turn on column view in the agenda.
 @end table
 
@@ -8578,7 +8578,7 @@ start it with @samp{#+ }.  Also entire subtrees starting with the word
 
 @table @kbd
 @kindex C-c ;
-@item C-c ;
+@item C-c ;, (@code{org-toggle-comment})
 Toggle the COMMENT keyword at the beginning of an entry.
 @end table
 
@@ -8706,7 +8706,7 @@ areas in HTML export}.
 
 @table @kbd
 @kindex C-c '
-@item C-c '
+@item C-c ', (@code{org-edit-special})
 Edit the source code example at point in its native mode.  This works by
 switching to a temporary buffer with the source code.  You need to exit by
 pressing @kbd{C-c '} again@footnote{Upon exit, lines starting with @samp{*}
@@ -8756,7 +8756,7 @@ the selected markup.  For example, to include a file as an item, use
 
 @table @kbd
 @kindex C-c '
-@item C-c '
+@item C-c ', (@code{org-edit-special})
 Visit the include file at point.
 @end table
 
@@ -8978,7 +8978,7 @@ typeset expressions:
 
 @table @kbd
 @kindex C-c C-x C-l
-@item C-c C-x C-l
+@item C-c C-x C-l, (@code{org-preview-latex-fragment})
 Produce a preview image of the La@TeX{} fragment at point and overlay it
 over the source code.  If there is no fragment at point, process all
 fragments in the current entry (between two headlines).  When called
@@ -8986,7 +8986,7 @@ with a prefix argument, process the entire subtree.  When called with
 two prefix arguments, or when the cursor is before the first headline,
 process the entire buffer.
 @kindex C-c C-c
-@item C-c C-c
+@item C-c C-c, (@code{org-ctrl-c-ctrl-c})
 Remove the overlay preview images.
 @end table
 
@@ -9252,7 +9252,7 @@ the subtrees are exported.
 
 @table @kbd
 @kindex C-c C-e
-@item C-c C-e
+@item C-c C-e, (@code{org-export})
 @vindex org-export-run-in-background
 Dispatcher for export and publishing commands.  Displays a help-window
 listing the additional key(s) needed to launch an export or publishing
@@ -9970,7 +9970,7 @@ support with
 
 @table @kbd
 @kindex C-c C-b
-@item C-c C-b
+@item C-c C-b, (@code{org-backward-same-level})
 In @code{org-beamer-mode}, this key offers fast selection of a beamer
 environment or the @code{BEAMER_col} property.
 @end table
@@ -13025,11 +13025,11 @@ these tables directly in the buffer.  Instead, you need to use the command
 
 @table @kbd
 @kindex C-c '
-@item C-c '
+@item C-c ', (@code{org-edit-special})
 Edit a @file{table.el} table.  Works when the cursor is in a table.el table.
 @c
 @kindex C-c ~
-@item C-c ~
+@item C-c ~, (@code{org-table-create-with-table.el})
 Insert a @file{table.el} table.  If there is already a table at point, this
 command converts it between the @file{table.el} format and the Org-mode
 format.  See the documentation string of the command
@@ -13668,7 +13668,7 @@ Dynamic blocks are updated with the following commands
 
 @table @kbd
 @kindex C-c C-x C-u
-@item C-c C-x C-u
+@item C-c C-x C-u, (@code{org-dblock-update})
 Update dynamic block at point.
 @kindex C-u C-c C-x C-u
 @item C-u C-c C-x C-u

[-- Attachment #3: Type: text/plain, Size: 201 bytes --]

_______________________________________________
Emacs-orgmode mailing list
Please use `Reply All' to send replies to the list.
Emacs-orgmode@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-orgmode
