Fix duplicate key definition.

ORGWEBPAGE/Changes.org

@@ -17,19 +17,22 @@
 
 ** Incompatible changes
 
-**** Prefix interpretation when storing remember notes
-     The prefix argument to the `C-c C-c' command that finishes a
-     remember process is not interpetred differently:
+*** Prefix interpretation when storing remember notes
+    The prefix argument to the `C-c C-c' command that finishes a
+    remember process is not interpetred differently:
 
-     :C-c C-c       Store the note to predefined file and headline
-     :C-1 C-c C-c   Select the storage location interactively
-     :C-0 C-c C-c   Re-use the last used location
-     :C-u C-c C-c   Like C-c C-c, but immediately visit the note
-     :              in its new location.
+    :C-c C-c       Store the note to predefined file and headline
+    :C-1 C-c C-c   Select the storage location interactively
+    :C-0 C-c C-c   Re-use the last used location
+    :C-u C-c C-c   Like C-c C-c, but immediately visit the note
+    :              in its new location.
 
-     This was requested by John Wiegley.
+    This was requested by John Wiegley.
 
 
+*** Capturing column view is now on `C-c C-x i'
+    The reason for this change was that `C-c C-x r' is also used
+    as a tty key replacement.
 ** Details
 
 *** Prefix arg 0 to S-RET disabled integer increment during copy

doc/org.texi

@@ -4083,8 +4083,8 @@ column view is @code{ITEM}.
 The following commands insert or update the dynamic block:
 
 @table @kbd
-@kindex C-c C-x r
-@item C-c C-x r
+@kindex C-c C-x i
+@item C-c C-x i
 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

doc/orgcard.tex

@@ -550,7 +550,7 @@ after  ``{\tt :}'', and dictionary words elsewhere.
 \key{special commands in property lines}{C-c C-c}
 \key{next/previous allowed value}{S-left/right}
 \key{turn on column view}{C-c C-x C-c}
-\key{capture columns view in dynamic block}{C-c C-x r}
+\key{capture columns view in dynamic block}{C-c C-x i}
 
 \key{quit column view}{q}
 \key{next/previous allowed value}{S-left/right}

lisp/org.el

@@ -12722,7 +12722,7 @@ The images can be removed again with \\[org-ctrl-c-ctrl-c]."
 (org-defkey org-mode-map "\C-c\C-x\C-l" 'org-preview-latex-fragment)
 (org-defkey org-mode-map "\C-c\C-x\C-b" 'org-toggle-checkbox)
 (org-defkey org-mode-map "\C-c\C-xp"    'org-set-property)
-(org-defkey org-mode-map "\C-c\C-xr"    'org-insert-columns-dblock)
+(org-defkey org-mode-map "\C-c\C-xi"    'org-insert-columns-dblock)
 
 (define-key org-mode-map "\C-c\C-x\C-c" 'org-columns)