Commit ec7ae032 authored by Chong Yidong's avatar Chong Yidong
Browse files

Updates to Programs chapter of Emacs manual.

* programs.texi (Program Modes): Mention modes that are not
included with Emacs.  Fix references to other manuals for tex.
Add index entry for backward-delete-char-untabify.  Mention
prog-mode-hook.
(Which Function): Use "global minor mode" terminology.
(Basic Indent, Multi-line Indent): Refer to previous descriptions
in Indentation chapter to avoid duplication.
(Expressions): Copyedit.
(Matching): Document Electric Pair mode.

* ack.texi (Acknowledgments):
* rmail.texi (Movemail, Other Mailbox Formats):
* frames.texi (Frames): Don't capitalize "Unix".
parent 6d5eb5b0
2011-12-04 Chong Yidong <cyd@gnu.org>
* programs.texi (Program Modes): Mention modes that are not
included with Emacs. Fix references to other manuals for tex.
Add index entry for backward-delete-char-untabify. Mention
prog-mode-hook.
(Which Function): Use "global minor mode" terminology.
(Basic Indent, Multi-line Indent): Refer to previous descriptions
in Indentation chapter to avoid duplication.
(Expressions): Copyedit.
(Matching): Document Electric Pair mode.
* ack.texi (Acknowledgments):
* rmail.texi (Movemail, Other Mailbox Formats):
* frames.texi (Frames): Don't capitalize "Unix".
2011-12-04 Chong Yidong <cyd@gnu.org>
* text.texi (Nroff Mode): Mention what nroff is.
......
......@@ -1272,8 +1272,8 @@ Colin Walters wrote Ibuffer, an enhanced buffer menu.
Barry Warsaw wrote @file{assoc.el}, a set of utility functions for
working with association lists; @file{cc-mode.el}, a mode for editing
C, C@t{++}, and Java code, based on earlier work by Dave Detlefs,
Stewart Clamen, and Richard Stallman; @file{elp.el}, a profiler
for Emacs Lisp programs; @file{man.el}, a mode for reading UNIX manual
Stewart Clamen, and Richard Stallman; @file{elp.el}, a profiler for
Emacs Lisp programs; @file{man.el}, a mode for reading Unix manual
pages; @file{regi.el}, providing an AWK-like functionality for use in
lisp programs; @file{reporter.el}, providing customizable bug
reporting for lisp packages; and @file{supercite.el}, a minor mode for
......
......@@ -32,7 +32,7 @@ unavailable. However, it is still possible to create multiple
``frames'' on text-only terminals; such frames are displayed one at a
time, filling the entire terminal screen (@pxref{Non-Window
Terminals}). It is also possible to use the mouse on some text-only
terminals (@pxref{Text-Only Mouse}, for doing so on GNU and UNIX
terminals (@pxref{Text-Only Mouse}, for doing so on GNU and Unix
systems; and
@iftex
@pxref{MS-DOS Mouse,,,emacs-xtra,Specialized Emacs Features},
......
This diff is collapsed.
......@@ -1340,17 +1340,18 @@ included in GNU mailutils (the ``mailutils version,''
command line syntax and the same basic subset of options. However, the
Mailutils version offers additional features.
The Emacs version of @code{movemail} is able to retrieve mail from the
usual UNIX mailbox formats and from remote mailboxes using the POP3
protocol.
The Emacs version of @code{movemail} is able to retrieve mail from
the usual Unix mailbox formats and from remote mailboxes using the
POP3 protocol.
The Mailutils version is able to handle a wide set of mailbox
formats, such as plain UNIX mailboxes, @code{maildir} and @code{MH}
mailboxes, etc. It is able to access remote mailboxes using the POP3 or
IMAP4 protocol, and can retrieve mail from them using a TLS encrypted
channel. It also accepts mailbox arguments in @acronym{URL} form.
The detailed description of mailbox @acronym{URL}s can be found in
@ref{URL,,,mailutils,Mailbox URL Formats}. In short, a @acronym{URL} is:
formats, such as plain Unix mailboxes, @code{maildir} and @code{MH}
mailboxes, etc. It is able to access remote mailboxes using the POP3
or IMAP4 protocol, and can retrieve mail from them using a TLS
encrypted channel. It also accepts mailbox arguments in @acronym{URL}
form. The detailed description of mailbox @acronym{URL}s can be found
in @ref{URL,,,mailutils,Mailbox URL Formats}. In short, a
@acronym{URL} is:
@smallexample
@var{proto}://[@var{user}[:@var{password}]@@]@var{host-or-file-name}
......@@ -1381,9 +1382,9 @@ local mailbox.
@table @code
@item mbox
Usual UNIX mailbox format. In this case, neither @var{user} nor
@var{pass} are used, and @var{host-or-file-name} denotes the file name of
the mailbox file, e.g., @code{mbox://var/spool/mail/smith}.
Usual Unix mailbox format. In this case, neither @var{user} nor
@var{pass} are used, and @var{host-or-file-name} denotes the file name
of the mailbox file, e.g., @code{mbox://var/spool/mail/smith}.
@item mh
A local mailbox in the @acronym{MH} format. @var{User} and
......@@ -1524,7 +1525,7 @@ use it, add the @samp{--tls} flag to @code{rmail-movemail-flags}.
@section Retrieving Mail from Local Mailboxes in Various Formats
If your incoming mail is stored on a local machine in a format other
than UNIX mailbox, you will need the Mailutils @code{movemail} to
than Unix mailbox, you will need the Mailutils @code{movemail} to
retrieve it. @xref{Movemail}, for the detailed description of
@code{movemail} versions. For example, to access mail from a inbox in
@code{maildir} format located in @file{/var/spool/mail/in}, you would
......
......@@ -32,9 +32,14 @@ structure.
@findex nxml-mode
Emacs has other major modes for text which contains ``embedded''
commands, such as @TeX{} and La@TeX{} (@pxref{TeX Mode}); HTML and
SGML (@pxref{HTML Mode}); XML (@pxref{Top,The nXML Mode
Manual,,nxml-mode, nXML Mode}); and Groff and Nroff (@pxref{Nroff
Mode}).
SGML (@pxref{HTML Mode}); XML
@ifinfo
(@pxref{Top,The nXML Mode Manual,,nxml-mode, nXML Mode});
@end ifinfo
@ifnotinfo
(see the nXML mode Info manual, which is distributed with Emacs);
@end ifnotinfo
and Groff and Nroff (@pxref{Nroff Mode}).
@cindex ASCII art
If you need to edit pictures made out of text characters (commonly
......@@ -1764,8 +1769,15 @@ xml-mode}. Emacs uses nXML mode for files which have the extension
@file{.xml}. For XHTML files, which have the extension @file{.xhtml},
Emacs uses HTML mode by default; you can make it use nXML mode by
customizing the variable @code{auto-mode-alist} (@pxref{Choosing
Modes}). nXML mode is described in its own manual: @xref{Top, nXML
Modes}).
@ifinfo
nXML mode is described in its own manual: @xref{Top, nXML
Mode,,nxml-mode, nXML Mode}.
@end ifinfo
@ifnotinfo
nXML mode is described in an Info manual, which is distributed with
Emacs.
@end ifnotinfo
@vindex sgml-xml-mode
You may choose to use the less powerful SGML mode for editing XML,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment