emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] Changes to emacs/etc/TUTORIAL


From: Richard M. Stallman
Subject: [Emacs-diffs] Changes to emacs/etc/TUTORIAL
Date: Thu, 29 Aug 2002 10:43:49 -0400

Index: emacs/etc/TUTORIAL
diff -c emacs/etc/TUTORIAL:1.53 emacs/etc/TUTORIAL:1.54
*** emacs/etc/TUTORIAL:1.53     Fri Jul 19 16:55:05 2002
--- emacs/etc/TUTORIAL  Thu Aug 29 10:43:49 2002
***************
*** 303,317 ****
  immediately.  Type <Return> (the carriage-return key) to insert a
  Newline character.
  
! You can delete the last character you typed by typing <Delete>.
! <Delete> is a key on the keyboard, which may be labeled "Del".  In
! some cases, the "Backspace" key serves as <Delete>, but not always!
  
! More generally, <Delete> deletes the character immediately before the
  current cursor position.
  
  >> Do this now--type a few characters, then delete them
!    by typing <Delete> a few times.  Don't worry about this file
     being changed; you will not alter the master tutorial.  This is
     your personal copy of it.
  
--- 303,323 ----
  immediately.  Type <Return> (the carriage-return key) to insert a
  Newline character.
  
! You can delete the last character you typed by typing <Delback>.
! <Delback> is a key on the keyboard--the same one you normally use,
! outside Emacs, for deleting the last character you typed.  It is
! normally a large key a couple of lines up from the <Return> key, and
! it is usually labeled "Delete", "Del" or "Backspace".
! 
! If the large key there is labeled "Backspace", then that's the one you
! use for <Delback>.  There may also be another key labeled "Delete"
! somewhere else, but that's not <Delback>.
  
! More generally, <Delback> deletes the character immediately before the
  current cursor position.
  
  >> Do this now--type a few characters, then delete them
!    by typing <Delback> a few times.  Don't worry about this file
     being changed; you will not alter the master tutorial.  This is
     your personal copy of it.
  
***************
*** 323,329 ****
  >> Insert text until you reach the right margin, and keep on inserting.
     You'll see a continuation line appear.
  
! >> Use <Delete>s to delete the text until the line fits on one screen
     line again.  The continuation line goes away.
  
  You can delete a Newline character just like any other character.
--- 329,335 ----
  >> Insert text until you reach the right margin, and keep on inserting.
     You'll see a continuation line appear.
  
! >> Use <Delback>s to delete the text until the line fits on one screen
     line again.  The continuation line goes away.
  
  You can delete a Newline character just like any other character.
***************
*** 331,337 ****
  one line.  If the resulting combined line is too long to fit in the
  screen width, it will be displayed with a continuation line.
  
! >> Move the cursor to the beginning of a line and type <Delete>.  This
     merges that line with the previous line.
  
  >> Type <Return> to reinsert the Newline you deleted.
--- 337,343 ----
  one line.  If the resulting combined line is too long to fit in the
  screen width, it will be displayed with a continuation line.
  
! >> Move the cursor to the beginning of a line and type <Delback>.  This
     merges that line with the previous line.
  
  >> Type <Return> to reinsert the Newline you deleted.
***************
*** 346,362 ****
  Emacs and correcting errors.  You can delete by words or lines
  as well.  Here is a summary of the delete operations:
  
!       <Delete>     delete the character just before the cursor
        C-d          delete the next character after the cursor
  
!       M-<Delete>   kill the word immediately before the cursor
        M-d          kill the next word after the cursor
  
        C-k          kill from the cursor position to end of line
        M-k          kill to the end of the current sentence
  
! Notice that <Delete> and C-d vs M-<Delete> and M-d extend the parallel
! started by C-f and M-f (well, <Delete> is not really a control
  character, but let's not worry about that).  C-k and M-k are like C-e
  and M-e, sort of, in that lines are opposite sentences.
  
--- 352,368 ----
  Emacs and correcting errors.  You can delete by words or lines
  as well.  Here is a summary of the delete operations:
  
!       <Delback>     delete the character just before the cursor
        C-d          delete the next character after the cursor
  
!       M-<Delback>   kill the word immediately before the cursor
        M-d          kill the next word after the cursor
  
        C-k          kill from the cursor position to end of line
        M-k          kill to the end of the current sentence
  
! Notice that <Delback> and C-d vs M-<Delback> and M-d extend the parallel
! started by C-f and M-f (well, <Delback> is not really a control
  character, but let's not worry about that).  C-k and M-k are like C-e
  and M-e, sort of, in that lines are opposite sentences.
  
***************
*** 842,848 ****
     character to notice what happens to the cursor.
     Now you have searched for "cursor", once.
  >> Type C-s again, to search for the next occurrence of "cursor".
! >> Now type <Delete> four times and see how the cursor moves.
  >> Type <Return> to terminate the search.
  
  Did you see what happened?  Emacs, in an incremental search, tries to
--- 848,854 ----
     character to notice what happens to the cursor.
     Now you have searched for "cursor", once.
  >> Type C-s again, to search for the next occurrence of "cursor".
! >> Now type <Delback> four times and see how the cursor moves.
  >> Type <Return> to terminate the search.
  
  Did you see what happened?  Emacs, in an incremental search, tries to
***************
*** 858,869 ****
  Then see the section "Spontaneous Entry to Incremental Search" in the
  Emacs manual for advice on dealing with this "feature".
  
! If you are in the middle of an incremental search and type <Delete>,
  you'll notice that the last character in the search string is erased
  and the search backs up to the last place of the search.  For
  instance, suppose you have typed "c", to search for the first
  occurrence of "c".  Now if you type "u", the cursor will move
! to the first occurrence of "cu".  Now type <Delete>.  This erases
  the "u" from the search string, and the cursor moves back to
  the first occurrence of "c".
  
--- 864,875 ----
  Then see the section "Spontaneous Entry to Incremental Search" in the
  Emacs manual for advice on dealing with this "feature".
  
! If you are in the middle of an incremental search and type <Delback>,
  you'll notice that the last character in the search string is erased
  and the search backs up to the last place of the search.  For
  instance, suppose you have typed "c", to search for the first
  occurrence of "c".  Now if you type "u", the cursor will move
! to the first occurrence of "cu".  Now type <Delback>.  This erases
  the "u" from the search string, and the cursor moves back to
  the first occurrence of "c".
  




reply via email to

[Prev in Thread] Current Thread [Next in Thread]