Fixes related to the last Org merge.

[bpt/emacs.git] / etc / refcards / refcard.tex

diff --git a/etc/refcards/refcard.tex b/etc/refcards/refcard.tex
index 52b9348..84e19b0 100644 (file)
--- a/etc/refcards/refcard.tex
+++ b/etc/refcards/refcard.tex
@@ -1,7 +1,7 @@
 % Reference Card for GNU Emacs
 
-% Copyright (C) 1987, 1993, 1996-1997, 2001-2011
-%   Free Software Foundation, Inc.
+% Copyright (C) 1987, 1993, 1996-1997, 2001-2013 Free Software
+% Foundation, Inc.
 
 % Author: Stephen Gildea <gildea@stop.mail-abuse.org>
 
@@ -63,8 +63,7 @@
 
 % Nothing else needs to be changed below this line.
 
-\def\versionemacs{23}           % version of Emacs this is for
-\def\year{2011}                 % copyright year
+\input emacsver.tex
 
 \def\shortcopyrightnotice{\vskip 1ex plus 2 fill
   \centerline{\small \copyright\ \year\ Free Software Foundation, Inc.
@@ -332,6 +331,7 @@ If Emacs is still searching, \kbd{C-g} cancels only the part not matched.
 
 \shortcopyrightnotice
 
+\newcolumn
 \section{Motion}
 
 \paralign to \hsize{#\tabskip=10pt plus 1 fil&#\tabskip=0pt&#\cr
@@ -352,7 +352,10 @@ If Emacs is still searching, \kbd{C-g} cancels only the part not matched.
 \key{scroll to previous screen}{M-v}
 \key{scroll left}{C-x <}
 \key{scroll right}{C-x >}
-\key{scroll current line to center of screen}{C-u C-l}
+\key{scroll current line to center, top, bottom}{C-l}
+
+\key{goto line}{M-g g}
+\key{back to indentation}{M-m}
 
 \section{Killing and Deleting}
 
@@ -393,14 +396,15 @@ If Emacs is still searching, \kbd{C-g} cancels only the part not matched.
 
 Valid responses in query-replace mode are
 
-\key{{\bf replace} this one, go on to next}{SPC}
+\key{{\bf replace} this one, go on to next}{SPC {\rm or} y}
 \key{replace this one, don't move}{,}
-\key{{\bf skip} to next without replacing}{DEL}
+\key{{\bf skip} to next without replacing}{DEL {\rm or} n}
 \key{replace all remaining matches}{!}
 \key{{\bf back up} to the previous match}{^}
 \key{{\bf exit} query-replace}{RET}
 \key{enter recursive edit (\kbd{C-M-c} to exit)}{C-r}
 
+\newcolumn
 \section{Multiple Windows}
 
 When two commands are shown, the second is a similar command for a
@@ -438,6 +442,7 @@ frame instead of a window.
 \key{indent {\bf region} (mode-dependent)}{C-M-\\}
 \key{indent {\bf sexp} (mode-dependent)}{C-M-q}
 \key{indent region rigidly {\it arg\/} columns}{C-x TAB}
+\key{indent for comment}{M-;}
 
 \key{insert newline after point}{C-o}
 \key{move rest of line vertically down}{C-M-o}
@@ -536,6 +541,13 @@ minibuffer.  Type \kbd{F10} to activate menu bar items on text terminals.
 
 \key{expand previous word dynamically}{M-/}
 
+\section{Miscellaneous}
+
+\key{numeric argument}{C-u {\it num}}
+\key{negative argument}{M--}
+\key{quoted insert}{C-q {\it char}}
+
+\newcolumn
 \section{Regular Expressions}
 
 \key{any single character except a newline}{. {\rm(dot)}}
@@ -604,6 +616,7 @@ Other:
 
 \endindentedkeys
 
+\newcolumn
 \section{Registers}
 
 \key{save region in register}{C-x r s}