[Emacs-diffs] Changes to emacs/man/glossary.texi

[Richard M . Stallman]

Index: emacs/man/glossary.texi
diff -c emacs/man/glossary.texi:1.29 emacs/man/glossary.texi:1.30
*** emacs/man/glossary.texi:1.29        Sun Jan 30 11:26:25 2005
--- emacs/man/glossary.texi     Sun Mar  6 17:24:24 2005
***************
*** 65,71 ****
  editing session.  Emacs makes backup files automatically to help you
  track down or cancel changes you later regret making.  @xref{Backup}.
  
! @item Balance Parentheses
  Emacs can balance parentheses (or other matching delimiters) either
  manually or automatically.  You do manual balancing with the commands
  to move over parenthetical groupings (@pxref{Moving by Parens}).
--- 65,71 ----
  editing session.  Emacs makes backup files automatically to help you
  track down or cancel changes you later regret making.  @xref{Backup}.
  
! @item Balancing Parentheses
  Emacs can balance parentheses (or other matching delimiters) either
  manually or automatically.  You do manual balancing with the commands
  to move over parenthetical groupings (@pxref{Moving by Parens}).
***************
*** 139,144 ****
--- 139,147 ----
  @item By Default
  See `default.'
  
+ @item Byte Compilation
+ See `compilation.'
+ 
  @item @kbd{C-}
  @kbd{C-} in the name of a character is an abbreviation for Control.
  @xref{User Input,C-}.
***************
*** 246,260 ****
  
  @item Copyleft
  A copyleft is a notice giving the public legal permission to
! redistribute a program or other work of art.  Copyright is normally used
! to keep users divided and helpless; with copyleft we turn that around
! to empower users and encourage them to cooperate.
  
  The particular form of copyleft used by the GNU project is called the
  GNU General Public License.  @xref{Copying}.
  
  @item @key{CTRL}
! The @key{CTLR} or ``control'' key is what you hold down
  in order to enter a control character (q.v.).
  
  @item Current Buffer
--- 249,264 ----
  
  @item Copyleft
  A copyleft is a notice giving the public legal permission to
! redistribute and modify a program or other work of art, but requiring
! modified versions to carry similar permission.  Copyright is normally
! used to keep users divided and helpless; with copyleft we turn that
! around to empower users and encourage them to cooperate.
  
  The particular form of copyleft used by the GNU project is called the
  GNU General Public License.  @xref{Copying}.
  
  @item @key{CTRL}
! The @key{CTRL} or ``control'' key is what you hold down
  in order to enter a control character (q.v.).
  
  @item Current Buffer
***************
*** 263,269 ****
  @xref{Buffers}.
  
  @item Current Line
! The current line is a line point is on (@pxref{Point}).
  
  @item Current Paragraph
  The current paragraph is the paragraph that point is in.  If point is
--- 267,273 ----
  @xref{Buffers}.
  
  @item Current Line
! The current line is the line that point is on (@pxref{Point}).
  
  @item Current Paragraph
  The current paragraph is the paragraph that point is in.  If point is
***************
*** 284,291 ****
  
  @item Customization
  Customization is making minor changes in the way Emacs works.  It is
! often done by setting variables (@pxref{Variables}) or by rebinding
! key sequences (@pxref{Keymaps}).
  
  @cindex cut and paste
  @item Cut and Paste
--- 288,296 ----
  
  @item Customization
  Customization is making minor changes in the way Emacs works.  It is
! often done by setting variables (@pxref{Variables}) or faces
! (@pxref{Face Customization}), or by rebinding key sequences
! (@pxref{Keymaps}).
  
  @cindex cut and paste
  @item Cut and Paste
***************
*** 372,380 ****
  @samp{*Messages*} so you can review them later.  @xref{Echo Area}.
  
  @item Echoing
! Echoing is acknowledging the receipt of commands by displaying them (in
! the echo area).  Emacs never echoes single-character key sequences;
! longer key sequences echo only if you pause while typing them.
  
  @item Electric
  We say that a character is electric if it is normally self-inserting
--- 377,386 ----
  @samp{*Messages*} so you can review them later.  @xref{Echo Area}.
  
  @item Echoing
! Echoing is acknowledging the receipt of input events by displaying
! them (in the echo area).  Emacs never echoes single-character key
! sequences; longer key sequences echo only if you pause while typing
! them.
  
  @item Electric
  We say that a character is electric if it is normally self-inserting
***************
*** 493,508 ****
  @item Frame
  A frame is a rectangular cluster of Emacs windows.  Emacs starts out
  with one frame, but you can create more.  You can subdivide each frame
! into Emacs windows (q.v.@:).  When you are using a windowing system, all
! the frames can be visible at the same time.  @xref{Frames}.  Some
! other editors use the term ``window'' for this, but in Emacs a window
! means something else.
  
  @item Fringe
! On windowed displays, there's a narrow portion of the frame (q.v.@:)
! between the text area and the window's border.  Emacs displays the
! fringe using a special face (q.v.@:) called @code{fringe}.
! @xref{Faces,fringe}.
  
  @item FTP
  FTP is an acronym for File Transfer Protocol.  Emacs uses an FTP client
--- 499,514 ----
  @item Frame
  A frame is a rectangular cluster of Emacs windows.  Emacs starts out
  with one frame, but you can create more.  You can subdivide each frame
! into Emacs windows (q.v.@:).  When you are using a window system
! (q.v.@:), all the frames can be visible at the same time.
! @xref{Frames}.  Some other editors use the term ``window'' for this,
! but in Emacs a window means something else.
  
  @item Fringe
! On a graphical terminal (q.v.@:), there's a narrow portion of the
! frame (q.v.@:) between the text area and the window's border.  Emacs
! displays the fringe using a special face (q.v.@:) called
! @code{fringe}.  @xref{Faces,fringe}.
  
  @item FTP
  FTP is an acronym for File Transfer Protocol.  Emacs uses an FTP client
***************
*** 550,555 ****
--- 556,565 ----
  @key{RET} or @key{ESC}.  In Emacs, typing a graphic character inserts
  that character (in ordinary editing modes).  @xref{Inserting Text}.
  
+ @item Graphical Terminal
+ A graphical terminal is one that can display images and multiple fonts.
+ Usually it also has a window system (q.v.@:).
+ 
  @item Highlighting
  Highlighting text means displaying it with a different foreground and/or
  background color to make it stand out from the rest of the text in the
***************
*** 642,647 ****
--- 652,660 ----
  them extend exactly to a specified width.
  @xref{Format Justification}.
  
+ @item Keybinding
+ See `binding.'
+ 
  @item Keyboard Macro
  Keyboard macros are a way of defining new Emacs commands from
  sequences of existing ones, with no need to write a Lisp program.
***************
*** 761,766 ****
--- 774,783 ----
  which configures Emacs for editing a certain sort of text.  Ideally,
  each programming language has its own major mode.  @xref{Major Modes}.
  
+ @item Margin
+ The space between the usable part of a window (including the
+ fringe) and the window edge.
+ 
  @item Mark
  The mark points to a position in the text.  It specifies one end of the
  region (q.v.@:), point being the other end.  Many commands operate on
***************
*** 981,987 ****
  The region is the text between point (q.v.@:) and the mark (q.v.@:).
  Many commands operate on the text of the region.  @xref{Mark,Region}.
  
! @item Registers
  Registers are named slots in which text or buffer positions or
  rectangles can be saved for later use.  @xref{Registers}.  A related
  Emacs feature is `bookmarks' (q.v.@:).
--- 998,1004 ----
  The region is the text between point (q.v.@:) and the mark (q.v.@:).
  Many commands operate on the text of the region.  @xref{Mark,Region}.
  
! @item Register
  Registers are named slots in which text or buffer positions or
  rectangles can be saved for later use.  @xref{Registers}.  A related
  Emacs feature is `bookmarks' (q.v.@:).
***************
*** 1054,1060 ****
  applications.  Emacs has special mouse commands for transferring text
  using the secondary selection.  @xref{Secondary Selection}.
  
! @item Selecting
  Selecting a buffer means making it the current (q.v.@:) buffer.
  @xref{Select Buffer}.
  
--- 1071,1085 ----
  applications.  Emacs has special mouse commands for transferring text
  using the secondary selection.  @xref{Secondary Selection}.
  
! @item Selected Frame
! The selected frame is the one your input currently operates on.
! @xref{Frames}.
! 
! @item Selected Window
! The selected frame is the one your input currently operates on.
! @xref{Basic Windows}.
! 
! @item Selecting a Buffer
  Selecting a buffer means making it the current (q.v.@:) buffer.
  @xref{Select Buffer}.
  
***************
*** 1100,1106 ****
  space bar.
  
  @item Speedbar
! Speedbar is a special tall frame that provides fast access to Emacs
  buffers, functions within those buffers, Info nodes, and other
  interesting parts of text within Emacs.  @xref{Speedbar}.
  
--- 1125,1131 ----
  space bar.
  
  @item Speedbar
! The speedbar is a special tall frame that provides fast access to Emacs
  buffers, functions within those buffers, Info nodes, and other
  interesting parts of text within Emacs.  @xref{Speedbar}.
  
***************
*** 1262,1267 ****
--- 1287,1296 ----
  other editors use the term ``window'' for what we call a `frame'
  (q.v.@:) in Emacs.
  
+ @item Window System
+ A window system is a graphical terminal (q.v.@:) that can display multiple
+ windows for different programs at the same time.
+ 
  @item Word Abbrev
  See `abbrev.'