diff options
| author | Glenn Morris <rgm@gnu.org> | 2012-11-12 18:25:59 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2012-11-12 18:25:59 -0800 |
| commit | f78ee6afc094cdfd6162bfd645836e84875dcddf (patch) | |
| tree | 3a2c4f5d6441e53adadb69ed2af0b64abf3cf239 /doc/emacs | |
| parent | b95a9c0cba301ef8f1920a1d123ccd6873c14a63 (diff) | |
| parent | f8705f6e3102454bf1e3213956eb3ac8160ff047 (diff) | |
| download | emacs-f78ee6afc094cdfd6162bfd645836e84875dcddf.tar.gz | |
Merge from emacs-24; up to 2012-11-09T14:45:15Z!dmantipov@yandex.ru
Diffstat (limited to 'doc/emacs')
| -rw-r--r-- | doc/emacs/ChangeLog | 9 | ||||
| -rw-r--r-- | doc/emacs/building.texi | 4 | ||||
| -rw-r--r-- | doc/emacs/misc.texi | 10 |
3 files changed, 20 insertions, 3 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index f6d536a08d1..fbdb6363b34 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,12 @@ +2012-11-13 Chong Yidong <cyd@gnu.org> + + * building.texi (Multithreaded Debugging): gdb-stopped-hooks is + actually named gdb-stopped-functions. + +2012-11-13 Glenn Morris <rgm@gnu.org> + + * misc.texi (Single Shell): Mention async-shell-command-buffer. + 2012-11-10 Glenn Morris <rgm@gnu.org> * misc.texi (Terminal emulator): Rename `term-face' to `term'. diff --git a/doc/emacs/building.texi b/doc/emacs/building.texi index 3a3630138de..e0ea72902fb 100644 --- a/doc/emacs/building.texi +++ b/doc/emacs/building.texi @@ -1244,8 +1244,8 @@ depending on the reason which caused the stop. Customize the variable @code{gdb-switch-reasons} to select the stop reasons which will cause a thread switch. -@vindex gdb-stopped-hooks - The variable @code{gdb-stopped-hooks} allows you to execute your +@vindex gdb-stopped-functions + The variable @code{gdb-stopped-functions} allows you to execute your functions whenever some thread stops. In non-stop mode, you can switch between different modes for GUD diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi index 244920a23ae..1836c1982e6 100644 --- a/doc/emacs/misc.texi +++ b/doc/emacs/misc.texi @@ -542,11 +542,19 @@ which is impossible to ignore. You can also type @kbd{M-&} (@code{async-shell-command}) to execute a shell command asynchronously; this is exactly like calling @kbd{M-!} with a trailing @samp{&}, except that you do not need the @samp{&}. -The output buffer for asynchronous shell commands is named +The default output buffer for asynchronous shell commands is named @samp{*Async Shell Command*}. Emacs inserts the output into this buffer as it comes in, whether or not the buffer is visible in a window. +@vindex async-shell-command-buffer + If you want to run more than one asynchronous shell command at the +same time, they could end up competing for the output buffer. The +option @code{async-shell-command-buffer} specifies what to do about +this; e.g., whether to rename the pre-existing output buffer, or to +use a different buffer for the new command. Consult the variable's +documentation for more possibilities. + @kindex M-| @findex shell-command-on-region @kbd{M-|} (@code{shell-command-on-region}) is like @kbd{M-!}, but |