[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master b28debadf3 1/3: Merge from origin/emacs-28
From: |
Stefan Kangas |
Subject: |
master b28debadf3 1/3: Merge from origin/emacs-28 |
Date: |
Sat, 18 Jun 2022 00:53:11 -0400 (EDT) |
branch: master
commit b28debadf3ada1645ea3ea135d67189cf52fdc11
Merge: 06576d6a16 d671cd57c4
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>
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
---
doc/lispref/display.texi | 7 +++++++
doc/misc/tramp.texi | 7 -------
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 b98c2f8fa9..958eede977 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
original face definition by @code{defface} is inherited
(@pxref{Defining Faces}).
+Some modes, like @code{hl-line-mode}, use a face with an
+@code{:extend} property to mark the entire current line. Note,
+however, that Emacs will always allow you to move point after the
+final character in a buffer, and if the buffer ends with a newline
+character, point can be placed on what is seemingly a line at the end
+of the buffer---but Emacs can't highlight that ``line'', because it
+doesn't really exist.
@end table
@defun font-family-list &optional frame
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 12d4987726..a8230ac945 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -5325,13 +5325,6 @@ minibuffer:
(before my-minibuffer-complete activate)
(expand-abbrev))
@end group
-
-@group
-;; If you use partial-completion-mode
-(defadvice PC-do-completion
- (before my-PC-do-completion activate)
- (expand-abbrev))
-@end group
@end lisp
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 10043ba280..6646167b92 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)."
(defun cl-struct-sequence-type (struct-type)
"Return the sequence used to build STRUCT-TYPE.
-STRUCT-TYPE is a symbol naming a struct type. Return `record',
-`vector', or `list' if STRUCT-TYPE is a struct type, nil otherwise."
+STRUCT-TYPE is a symbol naming a struct type. Return values are
+either `vector', `list' or nil (and the latter indicates a
+`record' struct type."
(declare (side-effect-free t) (pure t))
(cl--struct-class-type (cl--struct-get-class struct-type)))