summaryrefslogtreecommitdiff
path: root/doc/emacs
diff options
context:
space:
mode:
Diffstat (limited to 'doc/emacs')
-rw-r--r--doc/emacs/ChangeLog67
-rw-r--r--doc/emacs/Makefile.in5
-rw-r--r--doc/emacs/ack.texi22
-rw-r--r--doc/emacs/cal-xtra.texi30
-rw-r--r--doc/emacs/custom.texi6
-rw-r--r--doc/emacs/emacs.texi1
-rw-r--r--doc/emacs/emacsver.texi2
-rw-r--r--doc/emacs/help.texi3
-rw-r--r--doc/emacs/misc.texi32
9 files changed, 97 insertions, 71 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 7c85d3a617e..5d85687bd00 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -20,58 +20,53 @@
* ack.texi (Acknowledgments):
* emacs.texi (Acknowledgments): Updates.
-2014-06-07 Glenn Morris <rgm@gnu.org>
+2014-06-08 Glenn Morris <rgm@gnu.org>
+
+ * ack.texi (Acknowledgments):
+ * emacs.texi (Acknowledgments): Updates.
* programs.texi (Prettifying Symbols): Remove node.
(Misc for Programs): Mention more briefly here.
* emacs.texi (Top): Update menu.
-2014-06-05 Glenn Morris <rgm@gnu.org>
-
* package.texi (Package Menu, Package Installation):
Mention signed packages.
-
-2014-06-03 Glenn Morris <rgm@gnu.org>
-
- * package.texi (Package Installation): Mention package-pinned-packages.
+ (Package Installation): Mention package-pinned-packages.
2014-06-02 Glenn Morris <rgm@gnu.org>
+ * ack.texi (Acknowledgments): Remove some obsolete items.
* misc.texi [iftex]: Update chapter summary.
- (Emulation): Remove ludicrously outdated claim.
-
-2014-05-29 Glenn Morris <rgm@gnu.org>
+ (Emulation): Remove section.
* macos.texi (Mac / GNUstep Customization): Mention ns custom group.
(Customization options specific to Mac OS / GNUstep): Remove section.
-2014-05-28 Glenn Morris <rgm@gnu.org>
-
- * macos.texi (Mac / GNUstep Customization): Mention some new features.
-
-2014-05-27 Glenn Morris <rgm@gnu.org>
-
* abbrevs.texi (Expanding Abbrevs): Update re abbrev-expand-function.
-2014-05-21 Eli Zaretskii <eliz@gnu.org>
+2014-05-26 Eli Zaretskii <eliz@gnu.org>
* frames.texi (Fonts): Clarify which frames are affected by
setting font from the menu and in default-frame-alist.
(Bug#17532)
-2014-05-12 Eli Zaretskii <eliz@gnu.org>
+2014-05-14 Eli Zaretskii <eliz@gnu.org>
- * mule.texi (Language Environments): Remove unused @anchor.
- (Bug#17479)
+ * mule.texi (Language Environments): Remove unused @anchor. (Bug#17479)
-2014-05-02 Eli Zaretskii <eliz@gnu.org>
+2014-05-04 Eli Zaretskii <eliz@gnu.org>
* trouble.texi (Lossage, DEL Does Not Delete, Stuck Recursive)
(Screen Garbled, Text Garbled, After a Crash, Emergency Escape)
(Bug Criteria, Understanding Bug Reporting, Checklist, Service):
Improve indexing.
-2014-04-29 Eli Zaretskii <eliz@gnu.org>
+2014-05-04 Leo Liu <sdl.web@gmail.com>
+
+ * cal-xtra.texi (Non-Gregorian Diary): Document new features for
+ Chinese calendar and diary.
+
+2014-04-30 Eli Zaretskii <eliz@gnu.org>
* trouble.texi (Quitting, DEL Does Not Delete, Emergency Escape)
(Bug Criteria): Fix usage of @kbd and @key. (Bug#17362)
@@ -146,12 +141,10 @@
* anti.texi (Antinews): Fix usage of @kbd and @key.
-2014-04-26 Eli Zaretskii <eliz@gnu.org>
-
* sending.texi (Mail Signature): Document signature variables used
by Message mode. (Bug#17308)
-2014-04-21 Eli Zaretskii <eliz@gnu.org>
+2014-04-22 Eli Zaretskii <eliz@gnu.org>
* buffers.texi (Uniquify): Clarify the default uniquification.
@@ -161,23 +154,39 @@
EMACSLOADPATH. Index all the environment variables.
(Misc Variables): Index all the environment variables.
-2014-04-13 Eli Zaretskii <eliz@gnu.org>
+2014-04-17 Paul Eggert <eggert@cs.ucla.edu>
+
+ * Makefile.in (infoclean): Be consistent about reporting failures.
+ Do not fail merely because the info directory does not exist,
+ but do fail if it exists and can't be cleaned.
+
+2014-04-16 Eli Zaretskii <eliz@gnu.org>
* display.texi (Cursor Display): Explain better how to customize
'blink-cursor-blinks'.
-2014-04-05 Glenn Morris <rgm@gnu.org>
+2014-04-07 Glenn Morris <rgm@gnu.org>
* trouble.texi (Checklist): Dribble files may contain passwords.
-2014-04-04 Glenn Morris <rgm@gnu.org>
-
* files.texi (Backup Names):
* arevert-xtra.texi (Supporting additional buffers):
Update for default values of some -function vars no longer being nil.
(Supporting additional buffers):
Update for buffer-stale-function also applying to file-buffers.
+2014-03-28 Glenn Morris <rgm@gnu.org>
+
+ * custom.texi (Terminal Init): Mention term-file-aliases.
+
+2014-03-26 Glenn Morris <rgm@gnu.org>
+
+ * ack.texi (Acknowledgments): Remove reference to obsolete file.
+
+2014-03-22 Glenn Morris <rgm@gnu.org>
+
+ * help.texi (Help Files): Update C-h g description.
+
2014-03-16 Dmitry Gutov <dgutov@yandex.ru>
* programs.texi (Matching): Update the missed spot. (Bug#17008)
diff --git a/doc/emacs/Makefile.in b/doc/emacs/Makefile.in
index 4a59ebed521..9006ba1fbed 100644
--- a/doc/emacs/Makefile.in
+++ b/doc/emacs/Makefile.in
@@ -199,7 +199,10 @@ distclean: clean
## In the standalone tarfile, the clean rule runs this.
infoclean:
- -cd $(buildinfodir) && rm -f emacs$(INFO_EXT) emacs$(INFO_EXT)-[1-9] emacs$(INFO_EXT)-[1-9][0-9]
+ rm -f \
+ $(buildinfodir)/emacs$(INFO_EXT) \
+ $(buildinfodir)/emacs$(INFO_EXT)-[1-9] \
+ $(buildinfodir)/emacs$(INFO_EXT)-[1-9][0-9]
maintainer-clean: distclean infoclean
diff --git a/doc/emacs/ack.texi b/doc/emacs/ack.texi
index ccd58b7aece..9f2496da263 100644
--- a/doc/emacs/ack.texi
+++ b/doc/emacs/ack.texi
@@ -349,8 +349,7 @@ mail messages; and @file{saveplace.el}, for preserving point's
location in files between editing sessions.
@item
-Gary Foster wrote @file{crisp.el}, the emulation for CRiSP and Brief
-editors; and @file{scroll-all.el}, a mode for scrolling several buffers
+Gary Foster wrote @file{scroll-all.el}, a mode for scrolling several buffers
together.
@item
@@ -601,7 +600,7 @@ buffers.
@item
Michael Kifer wrote @code{ediff}, an interactive interface to the
@command{diff}, @command{patch}, and @command{merge} programs; and
-Viper, another emulator of the VI editor.
+Viper, an emulator of the VI editor.
@item
Richard King wrote the first version of @file{userlock.el} and
@@ -884,9 +883,6 @@ Thien-Thi Nguyen and Dan Nicolaescu wrote @file{hideshow.el}, a minor
mode for selectively displaying blocks of text.
@item
-Jurgen Nickelsen wrote @file{ws-mode.el}, providing WordStar emulation.
-
-@item
Dan Nicolaescu added support for running Emacs as a daemon. He also
wrote @file{romanian.el}, support for editing Romanian text;
@file{iris-ansi.el}, support for running Emacs on SGI's @code{xwsh}
@@ -1037,10 +1033,8 @@ Alex Rezinsky wrote @file{which-func.el}, a mode that shows the name
of the current function in the mode line.
@item
-Rob Riepel wrote @file{tpu-edt.el} and its associated files, providing
-an emulation of the VMS TPU text editor emulating the VMS EDT editor,
-and @file{vt-control.el}, providing some control functions for the DEC
-VT line of terminals.
+Rob Riepel wrote @file{vt-control.el}, providing some control
+functions for the DEC VT line of terminals.
@item
Nick Roberts wrote @file{t-mouse.el}, for mouse support in text
@@ -1084,9 +1078,6 @@ James B. Salem and Brewster Kahle wrote @file{completion.el}, providing
dynamic word completion.
@item
-Masahiko Sato wrote @file{vip.el}, an emulation of the VI editor.
-
-@item
Holger Schauer wrote @file{fortune.el}, a package for using fortune in
message signatures.
@@ -1194,9 +1185,8 @@ written @file{easymenu.el}, a facility for defining Emacs menus;
color; and also co-authored portions of CC mode.
@item
-Sam Steingold wrote @file{gulp.el}, a facility for asking package
-maintainers for updated versions of their packages via e-mail, and
-@file{midnight.el}, a package for running a command every midnight.
+Sam Steingold wrote @file{midnight.el}, a package for running a
+command every midnight.
@item
Ake Stenhoff and Lars Lindberg wrote @file{imenu.el}, a framework for
diff --git a/doc/emacs/cal-xtra.texi b/doc/emacs/cal-xtra.texi
index 82864859473..cf1eba17dec 100644
--- a/doc/emacs/cal-xtra.texi
+++ b/doc/emacs/cal-xtra.texi
@@ -517,7 +517,7 @@ the fourth pattern.
@subsection Diary Entries Using non-Gregorian Calendars
As well as entries based on the standard Gregorian calendar, your
-diary can have entries based on Bahá'í, Hebrew, or Islamic dates.
+diary can have entries based on Bahá'í, Chinese, Hebrew, or Islamic dates.
Recognition of such entries can be time-consuming, however, and since
most people don't use them, you must explicitly enable their use. If
you want the diary to recognize Hebrew-date diary entries, for example,
@@ -531,22 +531,27 @@ you must do this:
@findex diary-islamic-mark-entries
@findex diary-bahai-list-entries
@findex diary-bahai-mark-entries
+@findex diary-chinese-list-entries
+@findex diary-chinese-mark-entries
@smallexample
(add-hook 'diary-nongregorian-listing-hook 'diary-hebrew-list-entries)
(add-hook 'diary-nongregorian-marking-hook 'diary-hebrew-mark-entries)
@end smallexample
@noindent
-Similarly, for Islamic and Bahá'í entries, add
-@code{diary-islamic-list-entries} and @code{diary-islamic-mark-entries}, or
-@code{diary-bahai-list-entries} and @code{diary-bahai-mark-entries}.
+Similarly, for Islamic, Bahá'í and Chinese entries, add
+@code{diary-islamic-list-entries} and @code{diary-islamic-mark-entries},
+@code{diary-bahai-list-entries} and @code{diary-bahai-mark-entries},
+or @code{diary-chinese-list-entries} and @code{diary-chinese-mark-entries}.
@vindex diary-bahai-entry-symbol
+@vindex diary-chinese-entry-symbol
@vindex diary-hebrew-entry-symbol
@vindex diary-islamic-entry-symbol
These diary entries have the same formats as Gregorian-date diary
entries; except that @code{diary-bahai-entry-symbol} (default @samp{B})
-must precede a Bahá'í date, @code{diary-hebrew-entry-symbol} (default
+must precede a Bahá'í date, @code{diary-chinese-entry-symbol} (default
+@samp{C}) a Chinese date, @code{diary-hebrew-entry-symbol} (default
@samp{H}) a Hebrew date, and @code{diary-islamic-entry-symbol} (default
@samp{I}) an Islamic date. Moreover, non-Gregorian month names may not
be abbreviated (because the first three letters are often not unique).
@@ -573,7 +578,7 @@ nonmarking if preceded by @code{diary-nonmarking-symbol} (default
Here is a table of commands used in the calendar to create diary
entries that match the selected date and other dates that are similar in
-the Bahá'í, Hebrew, or Islamic calendars:
+the Bahá'í, Chinese, Hebrew, or Islamic calendars:
@table @kbd
@item i h d
@@ -594,6 +599,14 @@ the Bahá'í, Hebrew, or Islamic calendars:
@code{diary-bahai-insert-monthly-entry}
@item i B y
@code{diary-bahai-insert-yearly-entry}
+@item i C d
+@code{diary-chinese-insert-entry}
+@item i C m
+@code{diary-chinese-insert-monthly-entry}
+@item i C y
+@code{diary-chinese-insert-yearly-entry}
+@item i C a
+@code{diary-chinese-insert-anniversary-entry}
@end table
@findex diary-hebrew-insert-entry
@@ -605,6 +618,11 @@ the Bahá'í, Hebrew, or Islamic calendars:
@findex diary-bahai-insert-entry
@findex diary-bahai-insert-monthly-entry
@findex diary-bahai-insert-yearly-entry
+@findex diary-chinese-insert-entry
+@findex diary-chinese-insert-monthly-entry
+@findex diary-chinese-insert-yearly-entry
+@findex diary-chinese-insert-anniversary-entry
+
These commands work much like the corresponding commands for ordinary
diary entries: they apply to the date that point is on in the calendar
window, and what they do is insert just the date portion of a diary
diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi
index 9b78128d323..0d0013f5ace 100644
--- a/doc/emacs/custom.texi
+++ b/doc/emacs/custom.texi
@@ -2445,9 +2445,13 @@ harmless, so those do not need a conditional.
@node Terminal Init
@subsection Terminal-specific Initialization
+@vindex term-file-aliases
Each terminal type can have a Lisp library to be loaded into Emacs when
it is run on that type of terminal. For a terminal type named
-@var{termtype}, the library is called @file{term/@var{termtype}} and it is
+@var{termtype}, the library is called @file{term/@var{termtype}}.
+(If there is an entry of the form @code{(@var{termtype} . @var{alias})}
+in the @code{term-file-aliases} association list, Emacs uses
+@var{alias} in place of @var{termtype}.) The library is
found by searching the directories @code{load-path} as usual and trying the
suffixes @samp{.elc} and @samp{.el}. Normally it appears in the
subdirectory @file{term} of the directory where most Emacs libraries are
diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi
index 023974fec84..e24e861b138 100644
--- a/doc/emacs/emacs.texi
+++ b/doc/emacs/emacs.texi
@@ -201,7 +201,6 @@ Advanced Features
* Editing Binary Files:: Editing binary files with Hexl mode.
* Saving Emacs Sessions:: Saving Emacs state from one session to the next.
* Recursive Edit:: Performing edits while "within another command".
-* Emulation:: Emulating some other editors with Emacs.
* Hyperlinking:: Following links in buffers.
* Amusements:: Various games and hacks.
* Packages:: Installing additional features.
diff --git a/doc/emacs/emacsver.texi b/doc/emacs/emacsver.texi
index cba7c1eb168..6329f8aa0e6 100644
--- a/doc/emacs/emacsver.texi
+++ b/doc/emacs/emacsver.texi
@@ -1,4 +1,4 @@
@c It would be nicer to generate this using configure and @version@.
@c However, that would mean emacsver.texi would always be newer
@c then the info files in release tarfiles.
-@set EMACSVER 24.3.91
+@set EMACSVER 24.4.50
diff --git a/doc/emacs/help.texi b/doc/emacs/help.texi
index db5448692f9..f47600d97ec 100644
--- a/doc/emacs/help.texi
+++ b/doc/emacs/help.texi
@@ -605,7 +605,8 @@ Display information about where to get external packages
@item C-h C-f
Display the Emacs frequently-answered-questions list (@code{view-emacs-FAQ}).
@item C-h g
-Display information about the GNU Project (@code{describe-gnu-project}).
+Visit a @uref{http://www.gnu.org} page with information about the GNU
+Project (@code{describe-gnu-project}).
@item C-h C-m
Display information about ordering printed copies of Emacs manuals
(@code{view-order-manuals}).
diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index f09f23e6a4b..ae1aefcee76 100644
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -1,17 +1,17 @@
@c This is part of the Emacs manual.
-@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2014 Free Software
-@c Foundation, Inc.
+@c Copyright (C) 1985-1987, 1993-1995, 1997, 2000-2014
+@c Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@iftex
@chapter Miscellaneous Commands
This chapter contains several brief topics that do not fit anywhere
-else: viewing ``document files'', reading Usenet news, running shell
-commands and shell subprocesses, using a single shared Emacs for
-utilities that expect to run an editor as a subprocess, printing
-hardcopy, sorting text, editing binary files, saving an Emacs session
-for later resumption, following hyperlinks, emulating other editors,
-and various diversions and amusements.
+else: reading Usenet news, viewing PDFs and other such documents, web
+browsing, running shell commands and shell subprocesses, using a
+single shared Emacs for utilities that expect to run an editor as a
+subprocess, printing, sorting text, editing binary files, saving an
+Emacs session for later resumption, recursive editing level, following
+hyperlinks, and various diversions and amusements.
@end iftex
@@ -2268,20 +2268,20 @@ new major mode which provides a command to switch back. These
approaches give you more flexibility to go back to unfinished tasks in
the order you choose.
+@ignore
+@c Apart from edt and viper, this is all obsolete.
+@c (Can't believe we were saying ``most other editors'' into 2014!)
+@c There seems no point having a node just for those, which both have
+@c their own manuals.
@node Emulation
@section Emulation
@cindex emulating other editors
@cindex other editors
@cindex EDT
@cindex vi
-@cindex PC key bindings
-@cindex scrolling all windows
-@cindex PC selection
-@cindex Motif key bindings
-@cindex Macintosh key bindings
@cindex WordStar
- GNU Emacs can be programmed to emulate (more or less) some other
+ GNU Emacs can be programmed to emulate (more or less) most other
editors. Standard facilities can emulate these:
@table @asis
@@ -2318,7 +2318,7 @@ buffers or major modes while in EDT emulation.
@item vi (Berkeley editor)
@findex viper-mode
-Viper is the newest emulator for vi. It implements several levels of
+Viper is an emulator for vi. It implements several levels of
emulation; level 1 is closest to vi itself, while level 5 departs
somewhat from strict emulation to take advantage of the capabilities of
Emacs. To invoke Viper, type @kbd{M-x viper-mode}; it will guide you
@@ -2359,6 +2359,8 @@ not use it.
@kbd{M-x wordstar-mode} provides a major mode with WordStar-like
key bindings.
@end table
+@end ignore
+
@node Hyperlinking
@section Hyperlinking and Navigation Features