[Emacs-diffs] Changes to emacs/man/frames.texi [emacs-unicode-2]

[Miles Bader]

Index: emacs/man/frames.texi
diff -c emacs/man/frames.texi:1.53.4.1 emacs/man/frames.texi:1.53.4.2
*** emacs/man/frames.texi:1.53.4.1      Fri Apr 16 12:50:41 2004
--- emacs/man/frames.texi       Sat Sep  4 09:14:26 2004
***************
*** 1,5 ****
  @c This is part of the Emacs manual.
! @c Copyright (C) 1985, 86, 87, 93, 94, 95, 97, 99, 2000, 2001
  @c   Free Software Foundation, Inc.
  @c See file emacs.texi for copying conditions.
  @node Frames, International, Windows, Top
--- 1,5 ----
  @c This is part of the Emacs manual.
! @c Copyright (C) 1985, 86, 87, 93, 94, 95, 97, 99, 2000, 2001, 2004
  @c   Free Software Foundation, Inc.
  @c See file emacs.texi for copying conditions.
  @node Frames, International, Windows, Top
***************
*** 230,235 ****
--- 230,237 ----
  back into the window.  This way, you can mark regions that don't fit
  entirely on the screen.
  
+ This way of setting the secondary selection does not alter the kill ring.
+ 
  @findex mouse-start-secondary
  @kindex M-Mouse-1
  @item M-Mouse-1
***************
*** 240,247 ****
  @kindex M-Mouse-3
  @item M-Mouse-3
  Make a secondary selection, using the place specified with @kbd{M-Mouse-1}
! as the other end (@code{mouse-secondary-save-then-kill}).  A second click
! at the same place kills the secondary selection just made.
  
  @findex mouse-yank-secondary
  @kindex M-Mouse-2
--- 242,250 ----
  @kindex M-Mouse-3
  @item M-Mouse-3
  Make a secondary selection, using the place specified with @kbd{M-Mouse-1}
! as the other end (@code{mouse-secondary-save-then-kill}).  This also
! puts the selected text in the kill ring.  A second click at the same
! place kills the secondary selection just made.
  
  @findex mouse-yank-secondary
  @kindex M-Mouse-2
***************
*** 376,383 ****
  
  @kindex C-Mouse-2 @r{(scroll bar)}
    @kbd{C-Mouse-2} on a scroll bar splits the corresponding window
! vertically, unless you are using an X toolkit's implementation of
! scroll bars.  @xref{Split Window}.
  
    The commands above apply to areas of the mode line which do not have
  special mouse bindings of their own.  Some areas, such as the buffer
--- 379,385 ----
  
  @kindex C-Mouse-2 @r{(scroll bar)}
    @kbd{C-Mouse-2} on a scroll bar splits the corresponding window
! vertically.  @xref{Split Window}.
  
    The commands above apply to areas of the mode line which do not have
  special mouse bindings of their own.  Some areas, such as the buffer
***************
*** 747,756 ****
  down to the level where you click.  By clicking repeatedly in the same
  place, you can scroll by the same distance over and over.
  
!   If you are using Emacs's own implementation of scroll bars, as opposed
! to scroll bars from an X toolkit, you can also click @kbd{C-Mouse-2} in
! the scroll bar to split a window vertically.  The split occurs on the
! line where you click.
  
  @findex scroll-bar-mode
  @vindex scroll-bar-mode
--- 749,756 ----
  down to the level where you click.  By clicking repeatedly in the same
  place, you can scroll by the same distance over and over.
  
!   You can also click @kbd{C-Mouse-2} in the scroll bar to split a
! window vertically.  The split occurs on the line where you click.
  
  @findex scroll-bar-mode
  @vindex scroll-bar-mode
***************
*** 800,814 ****
  @section Drag and drop in Emacs.
  
  @cindex drag and drop
!   Emacs supports drag and drop so that dropping of files and text is handeled.
  Currently supported drag and drop protocols are XDND, Motif and the old
! KDE 1.x protocol.  There is no drag support yet. 
  When text is dropped on Emacs, Emacs inserts the text where it is dropped.
  When a file is dragged from a file manager to Emacs, Emacs opens that file.
  As a special case, if a file is dropped on a dired buffer the file is
  copied or moved (depends on exactly how it is dragged and the application
  it was dragged from) to the directory the dired buffer is displaying.
  
  @vindex x-dnd-open-file-other-window
    A file is normally opened in the window it is dropped on, but if you
  prefer the file to be opened in a new window you can customize the variable
--- 800,825 ----
  @section Drag and drop in Emacs.
  
  @cindex drag and drop
!   Emacs supports drag and drop so that dropping of files and text is handled.
  Currently supported drag and drop protocols are XDND, Motif and the old
! KDE 1.x protocol.  There is no drag support yet.
  When text is dropped on Emacs, Emacs inserts the text where it is dropped.
  When a file is dragged from a file manager to Emacs, Emacs opens that file.
  As a special case, if a file is dropped on a dired buffer the file is
  copied or moved (depends on exactly how it is dragged and the application
  it was dragged from) to the directory the dired buffer is displaying.
  
+ @vindex x-dnd-test-function
+ @vindex x-dnd-known-types
+   When a user drags something from another application over Emacs, that other
+ application expects Emacs to tell it if Emacs can handle the data that is
+ dragged.  The variable @code{x-dnd-test-function} is used by Emacs to 
determine
+ what to reply.  The default value is @code{x-dnd-default-test-function}
+ which accepts drops if the type of the data to be dropped is present in
+ @code{x-dnd-known-types}.  You can customize @code{x-dnd-test-function} and/or
+ @code{x-dnd-known-types} if you want Emacs to accept or reject drops based
+ on some other criteria.
+ 
  @vindex x-dnd-open-file-other-window
    A file is normally opened in the window it is dropped on, but if you
  prefer the file to be opened in a new window you can customize the variable
***************
*** 896,902 ****
  
    You can customize the option @code{use-file-dialog} to suppress the
  use of file selection windows even if you still want other kinds
! of dialogs.  This option has no effect if you have supressed all dialog
  boxes with the option @code{use-dialog-box}.
  
  
--- 907,913 ----
  
    You can customize the option @code{use-file-dialog} to suppress the
  use of file selection windows even if you still want other kinds
! of dialogs.  This option has no effect if you have suppressed all dialog
  boxes with the option @code{use-dialog-box}.