diff options
| author | Chong Yidong | 2012-05-05 12:32:58 +0800 |
|---|---|---|
| committer | Chong Yidong | 2012-05-05 12:32:58 +0800 |
| commit | eceeb5fca618f3bc0743c2388148dd758229c7c9 (patch) | |
| tree | 314434b14014363326ec7ce2868c3b86af4d97c3 /doc/lispref/objects.texi | |
| parent | 248da2f497e8865e8bebb0e3adb9184ab36e95f2 (diff) | |
| parent | be4e7c155b6922dd6105f4be57164210c3441f37 (diff) | |
| download | emacs-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.texi | 3 |
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 | |||
| 1567 | Lisp object that designates a subprocess created by the Emacs process. | 1567 | Lisp object that designates a subprocess created by the Emacs process. |
| 1568 | Programs such as shells, GDB, ftp, and compilers, running in | 1568 | Programs such as shells, GDB, ftp, and compilers, running in |
| 1569 | subprocesses of Emacs, extend the capabilities of Emacs. | 1569 | subprocesses 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 |
| 1572 | output to Emacs for further manipulation. Emacs can also send signals | 1571 | output to Emacs for further manipulation. Emacs can also send signals |
| 1573 | to the subprocess. | 1572 | to the subprocess. |
| @@ -1631,7 +1630,7 @@ buffer temporarily in a different display style. Overlays have no read | |||
| 1631 | syntax, and print in hash notation, giving the buffer name and range of | 1630 | syntax, and print in hash notation, giving the buffer name and range of |
| 1632 | positions. | 1631 | positions. |
| 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 |