diff options
| author | Stefan Kangas | 2022-06-18 06:31:18 +0200 |
|---|---|---|
| committer | Stefan Kangas | 2022-06-18 06:31:18 +0200 |
| commit | b28debadf3ada1645ea3ea135d67189cf52fdc11 (patch) | |
| tree | 66b007762c029a5ebc85ab7ec0b9c7efcd799baa | |
| parent | 06576d6a16fa61f6f1d5031754145a92ab41aa9b (diff) | |
| parent | d671cd57c488ec792997fd4051440187dec3434f (diff) | |
| download | emacs-b28debadf3ada1645ea3ea135d67189cf52fdc11.tar.gz emacs-b28debadf3ada1645ea3ea135d67189cf52fdc11.zip | |
Merge from origin/emacs-28
d671cd57c4 Update cl-struct-sequence-type doc string
017bdb1611 Fix a tagging problem in tramp.texi
e0bac17bbc Mention face quirks after the final line in the lispref ma...
ad74677cf3 Delete reference to obsolete library complete.el
| -rw-r--r-- | doc/lispref/display.texi | 7 | ||||
| -rw-r--r-- | doc/misc/tramp.texi | 7 | ||||
| -rw-r--r-- | lisp/emacs-lisp/cl-macs.el | 5 |
3 files changed, 10 insertions, 9 deletions
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index b98c2f8fa93..958eede9771 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi | |||
| @@ -2706,6 +2706,13 @@ doesn't specify an explicit value for a face, the value from the | |||
| 2706 | original face definition by @code{defface} is inherited | 2706 | original face definition by @code{defface} is inherited |
| 2707 | (@pxref{Defining Faces}). | 2707 | (@pxref{Defining Faces}). |
| 2708 | 2708 | ||
| 2709 | Some modes, like @code{hl-line-mode}, use a face with an | ||
| 2710 | @code{:extend} property to mark the entire current line. Note, | ||
| 2711 | however, that Emacs will always allow you to move point after the | ||
| 2712 | final character in a buffer, and if the buffer ends with a newline | ||
| 2713 | character, point can be placed on what is seemingly a line at the end | ||
| 2714 | of the buffer---but Emacs can't highlight that ``line'', because it | ||
| 2715 | doesn't really exist. | ||
| 2709 | @end table | 2716 | @end table |
| 2710 | 2717 | ||
| 2711 | @defun font-family-list &optional frame | 2718 | @defun font-family-list &optional frame |
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi index 12d49877269..a8230ac9451 100644 --- a/doc/misc/tramp.texi +++ b/doc/misc/tramp.texi | |||
| @@ -5325,13 +5325,6 @@ minibuffer: | |||
| 5325 | (before my-minibuffer-complete activate) | 5325 | (before my-minibuffer-complete activate) |
| 5326 | (expand-abbrev)) | 5326 | (expand-abbrev)) |
| 5327 | @end group | 5327 | @end group |
| 5328 | |||
| 5329 | @group | ||
| 5330 | ;; If you use partial-completion-mode | ||
| 5331 | (defadvice PC-do-completion | ||
| 5332 | (before my-PC-do-completion activate) | ||
| 5333 | (expand-abbrev)) | ||
| 5334 | @end group | ||
| 5335 | @end lisp | 5328 | @end lisp |
| 5336 | 5329 | ||
| 5337 | The reduced typing: @kbd{C-x C-f xy @key{TAB}}. | 5330 | The reduced typing: @kbd{C-x C-f xy @key{TAB}}. |
diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el index 10043ba2807..6646167b92b 100644 --- a/lisp/emacs-lisp/cl-macs.el +++ b/lisp/emacs-lisp/cl-macs.el | |||
| @@ -3337,8 +3337,9 @@ the form NAME which is a shorthand for (NAME NAME)." | |||
| 3337 | 3337 | ||
| 3338 | (defun cl-struct-sequence-type (struct-type) | 3338 | (defun cl-struct-sequence-type (struct-type) |
| 3339 | "Return the sequence used to build STRUCT-TYPE. | 3339 | "Return the sequence used to build STRUCT-TYPE. |
| 3340 | STRUCT-TYPE is a symbol naming a struct type. Return `record', | 3340 | STRUCT-TYPE is a symbol naming a struct type. Return values are |
| 3341 | `vector', or `list' if STRUCT-TYPE is a struct type, nil otherwise." | 3341 | either `vector', `list' or nil (and the latter indicates a |
| 3342 | `record' struct type." | ||
| 3342 | (declare (side-effect-free t) (pure t)) | 3343 | (declare (side-effect-free t) (pure t)) |
| 3343 | (cl--struct-class-type (cl--struct-get-class struct-type))) | 3344 | (cl--struct-class-type (cl--struct-get-class struct-type))) |
| 3344 | 3345 | ||