[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 665fe1c 2/2: Merge branch 'master' of git.sv.gnu.org:/srv/git/ema
From: |
Michael Albinus |
Subject: |
master 665fe1c 2/2: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs |
Date: |
Tue, 25 Aug 2020 10:27:22 -0400 (EDT) |
branch: master
commit 665fe1c18594dbc817c674898cf102e3e390c112
Merge: f9754ef 642c921
Author: Michael Albinus <michael.albinus@gmx.de>
Commit: Michael Albinus <michael.albinus@gmx.de>
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
---
lisp/files.el | 6 +++---
lisp/subr.el | 14 +++++++++++---
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/lisp/files.el b/lisp/files.el
index 873f362..b6abafa 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -5897,9 +5897,9 @@ last-modified time as the old ones. (This works on only
some systems.)
A prefix arg makes KEEP-TIME non-nil.
-Noninteractively, the last argument PARENTS says whether to
-create parent directories if they don't exist. Interactively,
-this happens by default.
+Noninteractively, the PARENTS argument says whether to create
+parent directories if they don't exist. Interactively, this
+happens by default.
If NEWNAME is a directory name, copy DIRECTORY as a subdirectory
there. However, if called from Lisp with a non-nil optional
diff --git a/lisp/subr.el b/lisp/subr.el
index a58a873..6603676 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -3071,9 +3071,17 @@ If MESSAGE is nil, instructions to type EXIT-CHAR are
displayed there."
o1))
(defun remove-overlays (&optional beg end name val)
- "Clear BEG and END of overlays whose property NAME has value VAL.
-Overlays might be moved and/or split.
-BEG and END default respectively to the beginning and end of buffer."
+ "Remove overlays between BEG and END that have property NAME with value VAL.
+Overlays might be moved and/or split. If any targeted overlays
+start before BEG, the overlays will be altered so that they end
+at BEG. Likewise, if the targeted overlays end after END, they
+will be altered so that they start at END. Overlays that start
+at or after BEG and end before END will be removed completely.
+
+BEG and END default respectively to the beginning and end of the
+buffer.
+Values are compared with `eq'.
+If either NAME or VAL are specified, both should be specified."
;; This speeds up the loops over overlays.
(unless beg (setq beg (point-min)))
(unless end (setq end (point-max)))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 665fe1c 2/2: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs,
Michael Albinus <=