diff options
| author | Eli Zaretskii | 2015-12-16 17:24:43 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2015-12-16 17:24:43 +0200 |
| commit | 4befa436fa122b72a77f20d3251217b3d994dcf9 (patch) | |
| tree | 1f24f0b3c221772e13f09ed0b1573a0116c69816 | |
| parent | 972830c019122e2167b0367516b534fd2f16a320 (diff) | |
| download | emacs-4befa436fa122b72a77f20d3251217b3d994dcf9.tar.gz emacs-4befa436fa122b72a77f20d3251217b3d994dcf9.zip | |
; * doc/emacs/programs.texi (Lisp Doc): Clarofy last change.
| -rw-r--r-- | doc/emacs/programs.texi | 6 | ||||
| -rw-r--r-- | etc/NEWS | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi index 39839029d24..8423b70203c 100644 --- a/doc/emacs/programs.texi +++ b/doc/emacs/programs.texi | |||
| @@ -1268,9 +1268,9 @@ information whenever there is a Lisp function or variable at point; | |||
| 1268 | for a function, it shows the argument list, and for a variable it | 1268 | for a function, it shows the argument list, and for a variable it |
| 1269 | shows the first line of the variable's documentation string. To | 1269 | shows the first line of the variable's documentation string. To |
| 1270 | toggle Eldoc mode, type @kbd{M-x eldoc-mode}. There's also a Global | 1270 | toggle Eldoc mode, type @kbd{M-x eldoc-mode}. There's also a Global |
| 1271 | Eldoc mode, which is turned on by default, and turns Eldoc mode on in | 1271 | Eldoc mode, which is turned on by default, and affects buffers, such |
| 1272 | buffers whose major mode is Emacs Lisp or Lisp Interaction (@kbd{M-x | 1272 | as @samp{*scratch*}, whose major mode is Emacs Lisp or Lisp |
| 1273 | global-eldoc-mode} to turn it off globally). | 1273 | Interaction (@w{@kbd{M-x global-eldoc-mode}} to turn it off globally). |
| 1274 | 1274 | ||
| 1275 | @node Hideshow | 1275 | @node Hideshow |
| 1276 | @section Hideshow minor mode | 1276 | @section Hideshow minor mode |
| @@ -557,8 +557,8 @@ instrumented function. | |||
| 557 | 557 | ||
| 558 | +++ | 558 | +++ |
| 559 | *** New minor mode `global-eldoc-mode' | 559 | *** New minor mode `global-eldoc-mode' |
| 560 | It is turned on by default, and turns on `eldoc-mode' in `*scratch*' | 560 | It is turned on by default, and affects `*scratch*' and other buffers |
| 561 | and other buffers whose major mode supports Emacs Lisp. | 561 | whose major mode supports Emacs Lisp. |
| 562 | 562 | ||
| 563 | --- | 563 | --- |
| 564 | *** `eldoc-documentation-function' now defaults to `ignore' | 564 | *** `eldoc-documentation-function' now defaults to `ignore' |