diff options
| author | Glenn Morris | 2018-02-17 07:50:28 -0800 |
|---|---|---|
| committer | Glenn Morris | 2018-02-17 07:50:28 -0800 |
| commit | 4fa90ff8f5fda54fc42049c990c52d3e5236fbe6 (patch) | |
| tree | 6c0a7893b3aab0166b35938338fa289c3a01df74 /lisp/eshell | |
| parent | cb3863370cbe574810f796726faa39ba0de0a429 (diff) | |
| parent | e5a29330aae4491fd384bacaff6f453c6434d322 (diff) | |
| download | emacs-4fa90ff8f5fda54fc42049c990c52d3e5236fbe6.tar.gz emacs-4fa90ff8f5fda54fc42049c990c52d3e5236fbe6.zip | |
Merge from origin/emacs-26
e5a2933 (origin/emacs-26) lisp/vc/: documentation fixes
f21f8e6 Document 'desktop-files-not-to-save'
d8917eb Improve documentation of Profiling features
b228839 Improve indexing of "performance" in ELisp manual
ab67b3e Minor change in Emacs manual's VC chapter
c352434 Avoid memory corruption with specpdl overflow + edebug (Bug#3...
593bbda Document comment-fill-column in the manual (Bug#11636)
bd4cc8d * doc/emacs/dired.texi (Marks vs Flags): Copyedits.
69107f3 ; Fix doc typos related to indefinite articles
aaad1e6 Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emac...
5906418 More fixes for the Emacs manual
9ab3df1 ; Fix doc typos related to indefinite articles
66a4e65 ; Fix doc typos related to indefinite articles
35e5c57 ; Fix doc typos related to indefinite articles
Diffstat (limited to 'lisp/eshell')
| -rw-r--r-- | lisp/eshell/esh-cmd.el | 2 | ||||
| -rw-r--r-- | lisp/eshell/esh-proc.el | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lisp/eshell/esh-cmd.el b/lisp/eshell/esh-cmd.el index ddab3350493..61c0ebc71d0 100644 --- a/lisp/eshell/esh-cmd.el +++ b/lisp/eshell/esh-cmd.el | |||
| @@ -80,7 +80,7 @@ | |||
| 80 | ;; | 80 | ;; |
| 81 | ;; echo x$(+ 1 2) "String $(+ 1 2)" | 81 | ;; echo x$(+ 1 2) "String $(+ 1 2)" |
| 82 | ;; | 82 | ;; |
| 83 | ;; To pass a Lisp symbol as a argument, use the alternate quoting | 83 | ;; To pass a Lisp symbol as an argument, use the alternate quoting |
| 84 | ;; syntax, since the single quote character is far too overused in | 84 | ;; syntax, since the single quote character is far too overused in |
| 85 | ;; shell syntax: | 85 | ;; shell syntax: |
| 86 | ;; | 86 | ;; |
diff --git a/lisp/eshell/esh-proc.el b/lisp/eshell/esh-proc.el index 841a95006f1..59fb9b926d4 100644 --- a/lisp/eshell/esh-proc.el +++ b/lisp/eshell/esh-proc.el | |||
| @@ -87,7 +87,7 @@ variable's value to take effect." | |||
| 87 | "Called each time a process is exec'd by `eshell-gather-process-output'. | 87 | "Called each time a process is exec'd by `eshell-gather-process-output'. |
| 88 | It is passed one argument, which is the process that was just started. | 88 | It is passed one argument, which is the process that was just started. |
| 89 | It is useful for things that must be done each time a process is | 89 | It is useful for things that must be done each time a process is |
| 90 | executed in a eshell mode buffer (e.g., `process-kill-without-query'). | 90 | executed in an eshell mode buffer (e.g., `process-kill-without-query'). |
| 91 | In contrast, `eshell-mode-hook' is only executed once when the buffer | 91 | In contrast, `eshell-mode-hook' is only executed once when the buffer |
| 92 | is created." | 92 | is created." |
| 93 | :type 'hook | 93 | :type 'hook |