X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/60b34e064f8b9b7d71aa3aea4ac8a757b609328e..4b70e299ef66906fd285198003c72a1439d1f252:/etc/refcard.tex

diff --git a/etc/refcard.tex b/etc/refcard.tex
index d4a2194214..cbe82c48c9 100644
--- a/etc/refcard.tex
+++ b/etc/refcard.tex
@@ -14,13 +14,14 @@
 \letterpaper=1
 
 % Nothing else needs to be changed below this line.
-% Copyright (c) 1987, 1993, 1996, 1997, 2005 Free Software Foundation, Inc.
+% Copyright (C) 1987, 1993, 1996, 1997, 2001, 2002, 2003, 2004,
+%   2005, 2006, 2007  Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
 % GNU Emacs is free software; you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
-% the Free Software Foundation; either version 2, or (at your option)
+% the Free Software Foundation; either version 3, or (at your option)
 % any later version.
 
 % GNU Emacs is distributed in the hope that it will be useful,
@@ -62,8 +63,10 @@
 
 % If there were room, it would be nice to see a section on Dired.
 
-\def\versionnumber{2.3}
-\def\year{2005}
+\def\versionnumber{2.3}         % version of this manual
+\def\versionyear{2007}          % year manual was updated
+\def\versionemacs{22}           % version of emacs this manual is for
+\def\year{2007}                 % copyright year
 
 \def\shortcopyrightnotice{\vskip 1ex plus 2 fill
   \centerline{\small \copyright\ \year\ Free Software Foundation, Inc.
@@ -72,12 +75,12 @@
 \def\copyrightnotice{
 \vskip 1ex plus 2 fill\begingroup\small
 \centerline{Copyright \copyright\ \year\ Free Software Foundation, Inc.}
-\centerline{v\versionnumber{} for GNU Emacs version 22, \year}
+\centerline{v\versionnumber{} for GNU Emacs version \versionemacs, \versionyear}
 \centerline{designed by Stephen Gildea}
 
-Permission is granted to make and distribute copies of
-this card provided the copyright notice and this permission notice
-are preserved on all copies.
+Permission is granted to make and distribute modified or unmodified
+copies of this card provided the copyright notice and this permission
+notice are preserved on all copies.
 
 For copies of the GNU Emacs manual, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
@@ -270,11 +273,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 \title{GNU Emacs Reference Card}
 
-\centerline{(for version 22)}
+\centerline{(for version \versionemacs)}
 
 \section{Starting Emacs}
 
-To enter GNU Emacs 22, just type its name: \kbd{emacs}
+To enter GNU Emacs \versionemacs, just type its name: \kbd{emacs}
 
 \section{Leaving Emacs}
 
@@ -289,7 +292,7 @@ To enter GNU Emacs 22, just type its name: \kbd{emacs}
 \key{{\bf insert} contents of another file into this buffer}{C-x i}
 \key{replace this file with the file you really want}{C-x C-v}
 \key{write buffer to a specified file}{C-x C-w}
-\key{version control checkin/checkout}{C-x C-q}
+\key{toggle read-only status of buffer}{C-x C-q}
 
 \section{Getting Help}
 
@@ -301,14 +304,14 @@ the directions.  If you are a first-time user, type \kbd{C-h t} for a
 \key{scroll help window}{C-M-v}
 
 \key{apropos: show commands matching a string}{C-h a}
-\key{show the function a key runs}{C-h c}
+\key{describe the function a key runs}{C-h k}
 \key{describe a function}{C-h f}
 \key{get mode-specific information}{C-h m}
 
 \section{Error Recovery}
 
 \key{{\bf abort} partially typed or executing command}{C-g}
-\metax{{\bf recover} a file lost by a system crash}{M-x recover-file}
+\metax{{\bf recover} files lost by a system crash}{M-x recover-session}
 \metax{{\bf undo} an unwanted change}{C-x u, C-_ {\rm or} C-/}
 \metax{restore a buffer to its original contents}{M-x revert-buffer}
 \key{redraw garbaged screen}{C-l}
@@ -327,7 +330,7 @@ the directions.  If you are a first-time user, type \kbd{C-h t} for a
 \key{abort current search}{C-g}
 
 Use \kbd{C-s} or \kbd{C-r} again to repeat the search in either direction.
-If Emacs is still searching, \kbd{C-g} cancels only the part not done.
+If Emacs is still searching, \kbd{C-g} cancels only the part not matched.
 
 \shortcopyrightnotice
 
@@ -446,7 +449,7 @@ frame instead of a window.
 \key{put exactly one space at point}{M-SPC}
 
 \key{fill paragraph}{M-q}
-\key{set fill column}{C-x f}
+\key{set fill column to {\it arg}}{C-x f}
 \key{set prefix each line starts with}{C-x .}
 
 \key{set face}{M-o}
@@ -475,7 +478,7 @@ The following keys are defined in the minibuffer.
 \key{abort command}{C-g}
 
 Type \kbd{C-x ESC ESC} to edit and repeat the last command that used the
-minibuffer.  Type \kbd{F10} to activate the menu bar using the minibuffer.
+minibuffer.  Type \kbd{F10} to activate menu bar items on text terminals.
 
 \newcolumn
 \title{GNU Emacs Reference Card}
@@ -572,7 +575,7 @@ minibuffer.  Type \kbd{F10} to activate the menu bar using the minibuffer.
 \section{Info}
 
 \key{enter the Info documentation reader}{C-h i}
-\key{find specified function or variable in Info}{C-h C-i}
+\key{find specified function or variable in Info}{C-h S}
 \beginindentedkeys
 
 Moving within a node:
@@ -591,13 +594,15 @@ Moving between nodes:
 \key{follow cross reference  (return with \kbd{l})}{f}
 \key{return to last node you saw}{l}
 \key{return to directory node}{d}
+\key{go to top node of Info file}{t}
 \key{go to any node by name}{g}
 
 Other:
 
 \key{run Info {\bf tutorial}}{h}
+\key{look up a subject in the indices}{i}
+\key{search nodes for regexp}{s}
 \key{{\bf quit} Info}{q}
-\key{search nodes for regexp}{M-s}
 
 \endindentedkeys
 
@@ -633,11 +638,11 @@ Other:
 % The intended audience here is the person who wants to make simple
 % customizations and knows Lisp syntax.
 
-Making global key bindings in Emacs Lisp (examples):
+Making global key bindings in Emacs Lisp (example):
 
 \beginexample%
-(global-set-key "\\C-cg" 'goto-line)
-(global-set-key "\\M-\#" 'query-replace-regexp)
+(global-set-key (kbd "C-c g") 'search-forward)
+(global-set-key (kbd "M-\#") 'query-replace-regexp)
 \endexample
 
 \section{Writing Commands}
@@ -652,7 +657,7 @@ An example:
 
 \beginexample%
 (defun this-line-to-top-of-window (line)
-  "Reposition line point is on to top of window.
+  "Reposition current line to top of window.
 With ARG, put point on line ARG."
   (interactive "P")
   (recenter (if (null line)
