Merge from emacs-24; up to 2012-05-05T02:50:20Z!monnier@iro.umontreal.ca

[gnu-emacs] / doc / emacs / frames.texi

diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi
index ee468e6f6855b9413b96abc306782feee273878e..e1b849e630e04faee5231a45263fa04480a47efc 100644 (file)
--- a/doc/emacs/frames.texi
+++ b/doc/emacs/frames.texi
@@ -2,7 +2,7 @@
 @c Copyright (C) 1985-1987, 1993-1995, 1997, 1999-2012
 @c   Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
-@node Frames, International, Windows, Top
+@node Frames
 @chapter Frames and Graphical Displays
 @cindex frames
 
@@ -81,8 +81,8 @@ Activate the region around the text selected by dragging, and copy it
 to the kill ring (@code{mouse-set-region}).
 
 @item Mouse-2
-Yank the last killed text at the click position
-(@code{mouse-yank-at-click}).
+Move point to where you click, and insert the contents of the primary
+selection there (@code{mouse-yank-primary}).
 
 @item Mouse-3
 If the region is active, move the nearer end of the region to the
@@ -499,7 +499,8 @@ Add a line to your init file, modifying the variable
 (@pxref{Frame Parameters}), like this:
 
 @example
-(add-to-list 'default-frame-alist '(font . "DejaVu Sans Mono-10"))
+(add-to-list 'default-frame-alist
+             '(font . "DejaVu Sans Mono-10"))
 @end example
 
 @cindex X defaults file