aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorGlenn Morris2014-06-01 18:14:08 -0700
committerGlenn Morris2014-06-01 18:14:08 -0700
commitbf0b7b55381e9a0ea57ed2ca5e865be20d20aed0 (patch)
tree97766de6f15b21f56bdb12e44cb4c918ad4e9e32 /doc
parent4d225fb815fd0d43aa003bddf3b76e1fd1da434c (diff)
downloademacs-bf0b7b55381e9a0ea57ed2ca5e865be20d20aed0.tar.gz
emacs-bf0b7b55381e9a0ea57ed2ca5e865be20d20aed0.zip
* doc/emacs/misc.texi: Small updates (no need to merge to trunk)
* doc/emacs/misc.texi [iftex]: Update chapter summary. (Emulation): Remove ludicrously outdated claim.
Diffstat (limited to 'doc')
-rw-r--r--doc/emacs/ChangeLog5
-rw-r--r--doc/emacs/misc.texi9
2 files changed, 9 insertions, 5 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index efb70f3b09b..9a332b260d4 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,8 @@
12014-06-02 Glenn Morris <rgm@gnu.org>
2
3 * misc.texi [iftex]: Update chapter summary.
4 (Emulation): Remove ludicrously outdated claim.
5
12014-05-29 Glenn Morris <rgm@gnu.org> 62014-05-29 Glenn Morris <rgm@gnu.org>
2 7
3 * macos.texi (Mac / GNUstep Customization): Mention ns custom group. 8 * macos.texi (Mac / GNUstep Customization): Mention ns custom group.
diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index a2813f8b197..99bae873c2b 100644
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -9,10 +9,9 @@
9else: viewing ``document files'', reading Usenet news, running shell 9else: viewing ``document files'', reading Usenet news, running shell
10commands and shell subprocesses, using a single shared Emacs for 10commands and shell subprocesses, using a single shared Emacs for
11utilities that expect to run an editor as a subprocess, printing 11utilities that expect to run an editor as a subprocess, printing
12hardcopy, sorting text, narrowing display to part of the buffer, 12hardcopy, sorting text, editing binary files, saving an Emacs session
13editing binary files, saving an Emacs session for later resumption, 13for later resumption, following hyperlinks, emulating other editors,
14following hyperlinks, browsing images, emulating other editors, and 14and various diversions and amusements.
15various diversions and amusements.
16 15
17@end iftex 16@end iftex
18 17
@@ -2282,7 +2281,7 @@ the order you choose.
2282@cindex Macintosh key bindings 2281@cindex Macintosh key bindings
2283@cindex WordStar 2282@cindex WordStar
2284 2283
2285 GNU Emacs can be programmed to emulate (more or less) most other 2284 GNU Emacs can be programmed to emulate (more or less) some other
2286editors. Standard facilities can emulate these: 2285editors. Standard facilities can emulate these:
2287 2286
2288@table @asis 2287@table @asis