(Top): Add Diff Mode to menu.
This commit is contained in:
parent
fe5c14081e
commit
350287efea
1 changed files with 64 additions and 71 deletions
135
man/emacs.texi
135
man/emacs.texi
|
@ -89,9 +89,9 @@ some of how to customize it; it corresponds to GNU Emacs version
|
||||||
@value{EMACSVER}.
|
@value{EMACSVER}.
|
||||||
|
|
||||||
@ifinfo
|
@ifinfo
|
||||||
If you never before used the Info documentation system, type @kbd{h},
|
To learn more about the Info documentation system, type @kbd{h}, and
|
||||||
and Emacs will take you to a programmed instruction sequence for the
|
Emacs will take you to a programmed instruction sequence for the Info
|
||||||
Info commands.
|
commands.
|
||||||
@end ifinfo
|
@end ifinfo
|
||||||
|
|
||||||
For information on extending Emacs, see @ref{Top, Emacs Lisp,, elisp, The
|
For information on extending Emacs, see @ref{Top, Emacs Lisp,, elisp, The
|
||||||
|
@ -197,6 +197,7 @@ Advanced Features
|
||||||
* Sorting:: Sorting lines, paragraphs or pages within Emacs.
|
* Sorting:: Sorting lines, paragraphs or pages within Emacs.
|
||||||
* Narrowing:: Restricting display and editing to a portion
|
* Narrowing:: Restricting display and editing to a portion
|
||||||
of the buffer.
|
of the buffer.
|
||||||
|
* Diff Mode:: Editing diff output.
|
||||||
* Two-Column:: Splitting apart columns to edit them
|
* Two-Column:: Splitting apart columns to edit them
|
||||||
in side-by-side windows.
|
in side-by-side windows.
|
||||||
* Editing Binary Files::Using Hexl mode to edit binary files.
|
* Editing Binary Files::Using Hexl mode to edit binary files.
|
||||||
|
@ -286,7 +287,7 @@ Killing and Moving Text
|
||||||
* Killing by Lines:: How to kill entire lines of text at one time.
|
* Killing by Lines:: How to kill entire lines of text at one time.
|
||||||
* Other Kill Commands:: Commands to kill large regions of text and
|
* Other Kill Commands:: Commands to kill large regions of text and
|
||||||
syntactic units such as words and sentences.
|
syntactic units such as words and sentences.
|
||||||
* Graphical Kill:: The kill ring on graphical terminals:
|
* Graphical Kill:: The kill ring on graphical displays:
|
||||||
yanking between applications.
|
yanking between applications.
|
||||||
* CUA Bindings:: Using @kbd{C-x}, @kbd{C-c}, @kbd{C-v} for copy
|
* CUA Bindings:: Using @kbd{C-x}, @kbd{C-c}, @kbd{C-v} for copy
|
||||||
and paste, with enhanced rectangle support.
|
and paste, with enhanced rectangle support.
|
||||||
|
@ -867,47 +868,47 @@ Emacs and Microsoft Windows
|
||||||
@unnumbered Preface
|
@unnumbered Preface
|
||||||
|
|
||||||
This manual documents the use and simple customization of the Emacs
|
This manual documents the use and simple customization of the Emacs
|
||||||
editor. The reader is not expected to be a programmer; simple
|
editor. Simple Emacs customizations do not require you to be a
|
||||||
customizations do not require programming skill. The user who is not
|
programmer, but if you are not interested in customizing, you can
|
||||||
interested in customizing can ignore the scattered customization hints.
|
ignore the customization hints.
|
||||||
|
|
||||||
This is primarily a reference manual, but can also be used as a
|
This is primarily a reference manual, but can also be used as a
|
||||||
primer. For complete beginners, it is a good idea to start with the
|
primer. If you are a complete beginner, we recommend you start with
|
||||||
on-line, learn-by-doing tutorial, before reading the manual. To run the
|
the on-line, learn-by-doing tutorial, before reading the manual. To
|
||||||
tutorial, start Emacs and type @kbd{C-h t}. This way you can learn
|
run the tutorial, start Emacs and type @kbd{C-h t}. The tutorial
|
||||||
Emacs by using Emacs on a specially designed file which describes
|
describes commands, tells you when to try them, and explains the
|
||||||
commands, tells you when to try them, and then explains the results you
|
results.
|
||||||
see.
|
|
||||||
|
|
||||||
On first reading, just skim chapters 1 and 2, which describe the
|
On first reading, just skim chapters 1 and 2, which describe the
|
||||||
notational conventions of the manual and the general appearance of the
|
notational conventions of the manual and the general appearance of the
|
||||||
Emacs display screen. Note which questions are answered in these
|
Emacs display screen. Note which questions are answered in these
|
||||||
chapters, so you can refer back later. After reading chapter 4, you
|
chapters, so you can refer back later. After reading chapter 4, you
|
||||||
should practice the commands there. The next few chapters describe
|
should practice the commands shown there. The next few chapters
|
||||||
fundamental techniques and concepts that are used constantly. You need
|
describe fundamental techniques and concepts that are used constantly.
|
||||||
to understand them thoroughly, experimenting with them if necessary.
|
You need to understand them thoroughly, so experiment with them
|
||||||
|
until you are fluent.
|
||||||
|
|
||||||
Chapters 14 through 19 describe intermediate-level features that are
|
Chapters 14 through 19 describe intermediate-level features that are
|
||||||
useful for all kinds of editing. Chapter 20 and following chapters
|
useful for many kinds of editing. Chapter 20 and following chapters
|
||||||
describe features that you may or may not want to use; read those
|
describe optional but useful features; read those chapters when you
|
||||||
chapters when you need them.
|
need them.
|
||||||
|
|
||||||
Read the Trouble chapter if Emacs does not seem to be working
|
Read the Trouble chapter if Emacs does not seem to be working
|
||||||
properly. It explains how to cope with some common problems
|
properly. It explains how to cope with several common problems
|
||||||
(@pxref{Lossage}), as well as when and how to report Emacs bugs
|
(@pxref{Lossage}), as well as when and how to report Emacs bugs
|
||||||
(@pxref{Bugs}).
|
(@pxref{Bugs}).
|
||||||
|
|
||||||
To find the documentation on a particular command, look in the index.
|
To find the documentation of a particular command, look in the index.
|
||||||
Keys (character commands) and command names have separate indexes. There
|
Keys (character commands) and command names have separate indexes.
|
||||||
is also a glossary, with a cross reference for each term.
|
There is also a glossary, with a cross reference for each term.
|
||||||
|
|
||||||
This manual is available as a printed book and also as an Info file.
|
This manual is available as a printed book and also as an Info file.
|
||||||
The Info file is for on-line perusal with the Info program, which will
|
The Info file is for on-line perusal with the Info program, which is
|
||||||
be the principal way of viewing documentation on-line in the GNU system.
|
the principal means of accessing on-line documentation in the GNU
|
||||||
Both the Info file and the Info program itself are distributed along
|
system. Both the Emacs Info file and an Info reader are included with
|
||||||
with GNU Emacs. The Info file and the printed book contain
|
GNU Emacs. The Info file and the printed book contain substantially
|
||||||
substantially the same text and are generated from the same source
|
the same text and are generated from the same source files, which are
|
||||||
files, which are also distributed along with GNU Emacs.
|
also distributed with GNU Emacs.
|
||||||
|
|
||||||
GNU Emacs is a member of the Emacs editor family. There are many
|
GNU Emacs is a member of the Emacs editor family. There are many
|
||||||
Emacs editors, all sharing common principles of organization. For
|
Emacs editors, all sharing common principles of organization. For
|
||||||
|
@ -1058,59 +1059,51 @@ T.@: Zimmermann, Reto Zimmermann, Neal Ziring, and Detlev Zundel.
|
||||||
@node Intro, Glossary, Distrib, Top
|
@node Intro, Glossary, Distrib, Top
|
||||||
@unnumbered Introduction
|
@unnumbered Introduction
|
||||||
|
|
||||||
You are reading about GNU Emacs, the GNU incarnation of the advanced,
|
You are reading about GNU Emacs, the GNU incarnation of the
|
||||||
self-documenting, customizable, extensible real-time display editor Emacs.
|
advanced, self-documenting, customizable, extensible editor Emacs.
|
||||||
(The `G' in `GNU' is not silent.)
|
(The `G' in `GNU' is not silent.)
|
||||||
|
|
||||||
We say that Emacs is a @dfn{display} editor because normally the text
|
We call Emacs advanced because it provides much more than simple
|
||||||
being edited is visible on the screen and is updated automatically as you
|
insertion and deletion. It can control subprocesses, indent programs
|
||||||
type your commands. @xref{Screen,Display}.
|
automatically, show two or more files at once, and edit formatted
|
||||||
|
text. Emacs editing commands operate in terms of characters, words,
|
||||||
We call it a @dfn{real-time} editor because the display is updated very
|
lines, sentences, paragraphs, and pages, as well as expressions and
|
||||||
frequently, usually after each character or pair of characters you
|
comments in various programming languages.
|
||||||
type. This minimizes the amount of information you must keep in your
|
|
||||||
head as you edit. @xref{Basic,Real-time,Basic Editing}.
|
|
||||||
|
|
||||||
We call Emacs advanced because it provides facilities that go beyond
|
|
||||||
simple insertion and deletion: controlling subprocesses; automatic
|
|
||||||
indentation of programs; viewing two or more files at once; editing
|
|
||||||
formatted text; and dealing in terms of characters, words, lines,
|
|
||||||
sentences, paragraphs, and pages, as well as expressions and comments in
|
|
||||||
several different programming languages.
|
|
||||||
|
|
||||||
@dfn{Self-documenting} means that at any time you can type a special
|
@dfn{Self-documenting} means that at any time you can type a special
|
||||||
character, @kbd{Control-h}, to find out what your options are. You can
|
character, @kbd{Control-h}, to find out what your options are. You can
|
||||||
also use it to find out what any command does, or to find all the commands
|
also use it to find out what any command does, or to find all the commands
|
||||||
that pertain to a topic. @xref{Help}.
|
that pertain to a topic. @xref{Help}.
|
||||||
|
|
||||||
@dfn{Customizable} means that you can change the definitions of Emacs
|
@dfn{Customizable} means that you can alter Emacs commands' behavior
|
||||||
commands in little ways. For example, if you use a programming language in
|
in simple ways. For example, if you use a programming language in
|
||||||
which comments start with @samp{<**} and end with @samp{**>}, you can tell
|
which comments start with @samp{<**} and end with @samp{**>}, you can
|
||||||
the Emacs comment manipulation commands to use those strings
|
tell the Emacs comment manipulation commands to use those strings
|
||||||
(@pxref{Comments}). Another sort of customization is rearrangement of the
|
(@pxref{Comments}). Another sort of customization is rearrangement of
|
||||||
command set. For example, if you prefer the four basic cursor motion
|
the command set. For example, you can rebind the basic cursor motion
|
||||||
commands (up, down, left and right) on keys in a diamond pattern on the
|
commands (up, down, left and right) to any keys on the keyboard that
|
||||||
keyboard, you can rebind the keys that way. @xref{Customization}.
|
you find comfortable. @xref{Customization}.
|
||||||
|
|
||||||
@dfn{Extensible} means that you can go beyond simple customization and
|
@dfn{Extensible} means that you can go beyond simple customization
|
||||||
write entirely new commands, programs in the Lisp language to be run by
|
and write entirely new commands---programs in the Lisp language to be
|
||||||
Emacs's own Lisp interpreter. Emacs is an ``on-line extensible''
|
run by Emacs's own Lisp interpreter. Emacs is an ``on-line
|
||||||
system, which means that it is divided into many functions that call
|
extensible'' system, which means that it is divided into many
|
||||||
each other, any of which can be redefined in the middle of an editing
|
functions that call each other, any of which can be redefined in the
|
||||||
session. Almost any part of Emacs can be replaced without making a
|
middle of an editing session. Almost any part of Emacs can be
|
||||||
separate copy of all of Emacs. Most of the editing commands of Emacs
|
replaced without making a separate copy of all of Emacs. Most of the
|
||||||
are written in Lisp; the few exceptions could have been written
|
editing commands of Emacs are written in Lisp; the few exceptions
|
||||||
in Lisp but are written in C for efficiency. Although only a programmer
|
could have been written in Lisp but use C instead for efficiency.
|
||||||
can write an extension, anybody can use it afterward. @xref{Top,
|
Writing an extension is programming, but non-programmers can use it
|
||||||
Emacs Lisp Intro, Preface, eintr, An Introduction to Programming in
|
afterwards. @xref{Top, Emacs Lisp Intro, Preface, eintr, An
|
||||||
Emacs Lisp}, if you want to learn Emacs Lisp programming.
|
Introduction to Programming in Emacs Lisp}, if you want to learn Emacs
|
||||||
|
Lisp programming.
|
||||||
|
|
||||||
When running on a graphical display, Emacs provides its own menus
|
When running on a graphical display, Emacs provides its own menus
|
||||||
and convenient handling of mouse buttons. But Emacs provides many of
|
and convenient handling of mouse buttons. In addition, Emacs provides
|
||||||
the benefits of a graphical display even on a text-only terminal. For
|
many of the benefits of a graphical display even on a text-only
|
||||||
instance, it can highlight parts of a file, display and edit several
|
terminal. For instance, it can highlight parts of a file, display and
|
||||||
files at once, move text between files, and edit files while running
|
edit several files at once, move text between files, and edit files
|
||||||
shell commands.
|
while running shell commands.
|
||||||
|
|
||||||
@include screen.texi
|
@include screen.texi
|
||||||
@include commands.texi
|
@include commands.texi
|
||||||
|
|
Loading…
Add table
Reference in a new issue