diff options
| author | Stefan Kangas | 2023-03-05 06:30:15 +0100 |
|---|---|---|
| committer | Stefan Kangas | 2023-03-05 06:30:15 +0100 |
| commit | 6fb8a4dff7ef22f96ebe1a775240617aabac6526 (patch) | |
| tree | b89b588cd0d76d698ffbc1e7556f28d31b7a45ce /doc | |
| parent | 4b3ccf3092eaf5573b0f4968ee9a4515d04fd061 (diff) | |
| parent | 836044f329a0a96810f2d88471cb040b9d373cce (diff) | |
| download | emacs-6fb8a4dff7ef22f96ebe1a775240617aabac6526.tar.gz emacs-6fb8a4dff7ef22f96ebe1a775240617aabac6526.zip | |
Merge from origin/emacs-29
836044f329a Fix c-ts-mode preproc directive indentation
64980a59b65 ; * lisp/files.el (hack-local-variables): Fix typo in the...
a7cd125d490 More robustly unspoof HOME in Eglot tests (bug#61637)
6c66dbd02c7 Turn on Eglot inlay hints by default
246f5b541c5 Update ts modes missed in 4c16fd3a512 to use column-0
0bfba49ca7c Robustify Eglot for "transient" projects
ea5fd375bb2 Fix documentation of 'normal-mode' in buffers that don't ...
4c16fd3a512 Change tree-sitter indent anchor 'point-min' to 'column-0'
f47b3930158 Fix go-ts-mode multi-line string indentation (bug#61923)
e0bf2da3db6 ; More accurate doc strings for 'window-at' and 'window-a...
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/emacs/modes.texi | 9 | ||||
| -rw-r--r-- | doc/lispref/modes.texi | 6 |
2 files changed, 9 insertions, 6 deletions
diff --git a/doc/emacs/modes.texi b/doc/emacs/modes.texi index 0e4b15fb514..d2f96af0b55 100644 --- a/doc/emacs/modes.texi +++ b/doc/emacs/modes.texi | |||
| @@ -473,9 +473,12 @@ specify which mode you prefer. | |||
| 473 | If you have changed the major mode of a buffer, you can return to | 473 | If you have changed the major mode of a buffer, you can return to |
| 474 | the major mode Emacs would have chosen automatically, by typing | 474 | the major mode Emacs would have chosen automatically, by typing |
| 475 | @kbd{M-x normal-mode}. This is the same function that | 475 | @kbd{M-x normal-mode}. This is the same function that |
| 476 | @code{find-file} calls to choose the major mode. It also processes | 476 | @code{find-file} calls to choose the major mode. If the buffer is |
| 477 | the file's @samp{-*-} line or local variables list (if any). | 477 | visiting a file, this command also processes the file's @samp{-*-} |
| 478 | @xref{File Variables}. | 478 | line and file-local variables list (if any). @xref{File Variables}. |
| 479 | If the buffer doesn't visit a file, the command processes only the | ||
| 480 | major mode specification, if any, in the @samp{-*-} line and in the | ||
| 481 | file-local variables list. | ||
| 479 | 482 | ||
| 480 | @vindex change-major-mode-with-file-name | 483 | @vindex change-major-mode-with-file-name |
| 481 | The commands @kbd{C-x C-w} and @code{set-visited-file-name} change to | 484 | The commands @kbd{C-x C-w} and @code{set-visited-file-name} change to |
diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi index fedb2804f26..c12224230fc 100644 --- a/doc/lispref/modes.texi +++ b/doc/lispref/modes.texi | |||
| @@ -5117,10 +5117,10 @@ This anchor is a function that is called with 3 arguments: @var{node}, | |||
| 5117 | @var{parent}, and @var{bol}, and returns the first non-whitespace | 5117 | @var{parent}, and @var{bol}, and returns the first non-whitespace |
| 5118 | character on the previous line. | 5118 | character on the previous line. |
| 5119 | 5119 | ||
| 5120 | @item point-min | 5120 | @item column-0 |
| 5121 | This anchor is a function that is called with 3 arguments: @var{node}, | 5121 | This anchor is a function that is called with 3 arguments: @var{node}, |
| 5122 | @var{parent}, and @var{bol}, and returns the beginning of the buffer. | 5122 | @var{parent}, and @var{bol}, and returns the beginning of the current |
| 5123 | This is useful as the beginning of the buffer is always at column 0. | 5123 | line, which is at column 0. |
| 5124 | 5124 | ||
| 5125 | @item comment-start | 5125 | @item comment-start |
| 5126 | This anchor is a function that is called with 3 arguments: @var{node}, | 5126 | This anchor is a function that is called with 3 arguments: @var{node}, |