From 59fa4c39f4141a0f2cb3c41e180ed812be577b27 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 16 Jul 2016 16:42:18 +0300 Subject: [PATCH 1/4] Avoid assertion violations in nhexl-mode * src/bidi.c (bidi_resolve_neutral): Convert an assertion to real code executed in all builds. (Bug#24001) --- src/bidi.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/bidi.c b/src/bidi.c index 573e513469d..c2208cd12c2 100644 --- a/src/bidi.c +++ b/src/bidi.c @@ -2977,15 +2977,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); From 219b39f5215200fa8128fd3b595017e0a380eb8f Mon Sep 17 00:00:00 2001 From: Noam Postavsky Date: Sun, 3 Jul 2016 21:40:26 -0400 Subject: [PATCH 2/4] kill-rectangle should mention killed-rectangle * lisp/rect.el (kill-rectangle): Mention `killed-rectangle' in docstring and warning message, rather than kill ring (Bug#19773). --- lisp/rect.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/rect.el b/lisp/rect.el index 43621d970d2..dd066caeac6 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))))))) From 9356fe239281ca15e12a4e5e93d7d00c56df2626 Mon Sep 17 00:00:00 2001 From: Robert Cochran Date: Fri, 15 Jul 2016 12:45:56 -0700 Subject: [PATCH 3/4] Expand FIXME near definition of fboundp This expansion of the FIXME is so that future developers are aware of the potential problems of aliasing fboundp to symbol-function without taking backwards compatibility into account. * src/data.c (fboundp): Note potential backwards compatibility issues in FIXME. Copyright-paperwork-exempt: yes --- src/data.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/data.c b/src/data.c index 2574cbbd764..d14c84e0472 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) From 9a41cd1215e60415777bb139c0669100e347375b Mon Sep 17 00:00:00 2001 From: Mark Oteiza Date: Wed, 20 Jul 2016 18:46:15 -0400 Subject: [PATCH 4/4] ; Fix typo Thanks to Robert Weiner. --- lisp/rect.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/rect.el b/lisp/rect.el index dd066caeac6..fb85b187d77 100644 --- a/lisp/rect.el +++ b/lisp/rect.el @@ -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)