aboutsummaryrefslogtreecommitdiffstats
path: root/doc/lispref/objects.texi
diff options
context:
space:
mode:
authorChong Yidong2012-05-05 12:32:58 +0800
committerChong Yidong2012-05-05 12:32:58 +0800
commiteceeb5fca618f3bc0743c2388148dd758229c7c9 (patch)
tree314434b14014363326ec7ce2868c3b86af4d97c3 /doc/lispref/objects.texi
parent248da2f497e8865e8bebb0e3adb9184ab36e95f2 (diff)
parentbe4e7c155b6922dd6105f4be57164210c3441f37 (diff)
downloademacs-eceeb5fca618f3bc0743c2388148dd758229c7c9.tar.gz
emacs-eceeb5fca618f3bc0743c2388148dd758229c7c9.zip
Merge from emacs-24; up to 2012-04-20T05:47:55Z!eliz@gnu.org
Diffstat (limited to 'doc/lispref/objects.texi')
-rw-r--r--doc/lispref/objects.texi3
1 files changed, 1 insertions, 2 deletions
diff --git a/doc/lispref/objects.texi b/doc/lispref/objects.texi
index b49d2bc05fe..f43b8d803f5 100644
--- a/doc/lispref/objects.texi
+++ b/doc/lispref/objects.texi
@@ -1567,7 +1567,6 @@ runs in a process of this sort. However, in Emacs Lisp, a process is a
1567Lisp object that designates a subprocess created by the Emacs process. 1567Lisp object that designates a subprocess created by the Emacs process.
1568Programs such as shells, GDB, ftp, and compilers, running in 1568Programs such as shells, GDB, ftp, and compilers, running in
1569subprocesses of Emacs, extend the capabilities of Emacs. 1569subprocesses of Emacs, extend the capabilities of Emacs.
1570
1571 An Emacs subprocess takes textual input from Emacs and returns textual 1570 An Emacs subprocess takes textual input from Emacs and returns textual
1572output to Emacs for further manipulation. Emacs can also send signals 1571output to Emacs for further manipulation. Emacs can also send signals
1573to the subprocess. 1572to the subprocess.
@@ -1631,7 +1630,7 @@ buffer temporarily in a different display style. Overlays have no read
1631syntax, and print in hash notation, giving the buffer name and range of 1630syntax, and print in hash notation, giving the buffer name and range of
1632positions. 1631positions.
1633 1632
1634 @xref{Overlays}, for how to create and use overlays. 1633 @xref{Overlays}, for information on how you can create and use overlays.
1635 1634
1636@node Font Type 1635@node Font Type
1637@subsection Font Type 1636@subsection Font Type