[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master a855bf4 11/15: Merge from origin/emacs-25
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] master a855bf4 11/15: Merge from origin/emacs-25 |
Date: |
Fri, 5 Aug 2016 21:15:39 +0000 (UTC) |
branch: master
commit a855bf48d42cd7cbc9c72def3584fd354d433f97
Merge: 8c818d8 9a41cd1
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>
Merge from origin/emacs-25
9a41cd1 ; Fix typo
9356fe2 Expand FIXME near definition of fboundp
219b39f kill-rectangle should mention killed-rectangle
59fa4c3 Avoid assertion violations in nhexl-mode
---
lisp/rect.el | 6 +++---
src/bidi.c | 14 ++++++--------
src/data.c | 7 ++++++-
3 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/lisp/rect.el b/lisp/rect.el
index 8803a47..13db7d8 100644
--- a/lisp/rect.el
+++ b/lisp/rect.el
@@ -284,7 +284,7 @@ With a prefix (or a FILL) argument, also fill lines where
nothing has to be
deleted.
If the buffer is read-only, Emacs will beep and refrain from deleting
-the rectangle, but put it in the kill ring anyway. This means that
+the rectangle, but put it in `killed-rectangle' anyway. This means that
you can use this command to copy text from a read-only buffer.
\(If the variable `kill-read-only-ok' is non-nil, then this won't
even beep.)"
@@ -295,7 +295,7 @@ even beep.)"
(setq deactivate-mark t)
(setq killed-rectangle (extract-rectangle start end))
(if kill-read-only-ok
- (progn (message "Read only text copied to kill ring") nil)
+ (progn (message "Read only text copied to `killed-rectangle'") nil)
(barf-if-buffer-read-only)
(signal 'text-read-only (list (current-buffer)))))))
@@ -403,7 +403,7 @@ With a prefix (or a FILL) argument, also fill too short
lines."
:version "25.1")
(defcustom rectangle-preview t
- "If non-nil, `string-rectangle' will show an-the-fly preview."
+ "If non-nil, `string-rectangle' will show an on-the-fly preview."
:version "25.1"
:type 'boolean)
diff --git a/src/bidi.c b/src/bidi.c
index 6ea84d9..5824de5 100644
--- a/src/bidi.c
+++ b/src/bidi.c
@@ -2971,15 +2971,13 @@ bidi_resolve_neutral (struct bidi_it *bidi_it)
/* N1-N2/Retaining */
|| type == WEAK_BN)
{
- if (bidi_it->next_for_neutral.type != UNKNOWN_BT)
+ if (bidi_it->next_for_neutral.type != UNKNOWN_BT
+ && (bidi_it->next_for_neutral.charpos > bidi_it->charpos
+ /* PDI defines an eos, so it's OK for it to serve as its
+ own next_for_neutral. */
+ || (bidi_it->next_for_neutral.charpos == bidi_it->charpos
+ && bidi_it->type == PDI)))
{
- /* Make sure the data for resolving neutrals we are
- about to use is valid. */
- eassert (bidi_it->next_for_neutral.charpos > bidi_it->charpos
- /* PDI defines an eos, so it's OK for it to
- serve as its own next_for_neutral. */
- || (bidi_it->next_for_neutral.charpos == bidi_it->charpos
- && bidi_it->type == PDI));
type = bidi_resolve_neutral_1 (bidi_it->prev_for_neutral.type,
bidi_it->next_for_neutral.type,
current_level);
diff --git a/src/data.c b/src/data.c
index 71da916..5af590a 100644
--- a/src/data.c
+++ b/src/data.c
@@ -629,7 +629,12 @@ global value outside of any lexical scope. */)
return (EQ (valcontents, Qunbound) ? Qnil : Qt);
}
-/* FIXME: Make it an alias for function-symbol! */
+/* FIXME: It has been previously suggested to make this function an
+ alias for symbol-function, but upon discussion at Debbug#23957,
+ there is a risk breaking backward compatiblity, as some users of
+ fboundp may expect `t' in particular, rather than any true
+ value. An alias is still welcome so long as the compatibility
+ issues are addressed. */
DEFUN ("fboundp", Ffboundp, Sfboundp, 1, 1, 0,
doc: /* Return t if SYMBOL's function definition is not void. */)
(register Lisp_Object symbol)
- [Emacs-diffs] master updated (92e5b41 -> c1b5000), Paul Eggert, 2016/08/05
- [Emacs-diffs] master 8d9ad89 02/15: ; Merge from origin/emacs-25, Paul Eggert, 2016/08/05
- [Emacs-diffs] master c5823cd 04/15: ; Merge from origin/emacs-25, Paul Eggert, 2016/08/05
- [Emacs-diffs] master 95c6606 08/15: ; Merge from origin/emacs-25, Paul Eggert, 2016/08/05
- [Emacs-diffs] master fe32258 14/15: ; Merge from origin/emacs-25, Paul Eggert, 2016/08/05
- [Emacs-diffs] master f902a6b 12/15: ; Merge from origin/emacs-25, Paul Eggert, 2016/08/05
- [Emacs-diffs] master 80fcf41 03/15: Merge from origin/emacs-25, Paul Eggert, 2016/08/05
- [Emacs-diffs] master 20e1d54 06/15: ; Merge from origin/emacs-25, Paul Eggert, 2016/08/05
- [Emacs-diffs] master b76885f 01/15: Merge from origin/emacs-25, Paul Eggert, 2016/08/05
- [Emacs-diffs] master 8c818d8 10/15: ; Merge from origin/emacs-25, Paul Eggert, 2016/08/05
- [Emacs-diffs] master a855bf4 11/15: Merge from origin/emacs-25,
Paul Eggert <=
- [Emacs-diffs] master 3498a1a 07/15: Merge from origin/emacs-25, Paul Eggert, 2016/08/05
- [Emacs-diffs] master 1a86b5d 05/15: Merge from origin/emacs-25, Paul Eggert, 2016/08/05
- [Emacs-diffs] master 6b780a2 09/15: Merge from origin/emacs-25, Paul Eggert, 2016/08/05
- [Emacs-diffs] master c1b5000 15/15: Merge from origin/emacs-25, Paul Eggert, 2016/08/05
- [Emacs-diffs] master 0274862 13/15: Merge from origin/emacs-25, Paul Eggert, 2016/08/05