Commit a855bf48 authored by Paul Eggert's avatar Paul Eggert
Browse files

Merge from origin/emacs-25

9a41cd12 ; Fix typo
9356fe23 Expand FIXME near definition of fboundp
219b39f5 kill-rectangle should mention killed-rectangle
59fa4c39 Avoid assertion violations in nhexl-mode
parents 8c818d8c 9a41cd12
...@@ -284,7 +284,7 @@ With a prefix (or a FILL) argument, also fill lines where nothing has to be ...@@ -284,7 +284,7 @@ With a prefix (or a FILL) argument, also fill lines where nothing has to be
deleted. deleted.
If the buffer is read-only, Emacs will beep and refrain from deleting 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. 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 \(If the variable `kill-read-only-ok' is non-nil, then this won't
even beep.)" even beep.)"
...@@ -295,7 +295,7 @@ even beep.)" ...@@ -295,7 +295,7 @@ even beep.)"
(setq deactivate-mark t) (setq deactivate-mark t)
(setq killed-rectangle (extract-rectangle start end)) (setq killed-rectangle (extract-rectangle start end))
(if kill-read-only-ok (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) (barf-if-buffer-read-only)
(signal 'text-read-only (list (current-buffer))))))) (signal 'text-read-only (list (current-buffer)))))))
...@@ -403,7 +403,7 @@ With a prefix (or a FILL) argument, also fill too short lines." ...@@ -403,7 +403,7 @@ With a prefix (or a FILL) argument, also fill too short lines."
:version "25.1") :version "25.1")
(defcustom rectangle-preview t (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" :version "25.1"
:type 'boolean) :type 'boolean)
......
...@@ -2971,15 +2971,13 @@ bidi_resolve_neutral (struct bidi_it *bidi_it) ...@@ -2971,15 +2971,13 @@ bidi_resolve_neutral (struct bidi_it *bidi_it)
/* N1-N2/Retaining */ /* N1-N2/Retaining */
|| type == WEAK_BN) || 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, type = bidi_resolve_neutral_1 (bidi_it->prev_for_neutral.type,
bidi_it->next_for_neutral.type, bidi_it->next_for_neutral.type,
current_level); current_level);
......
...@@ -629,7 +629,12 @@ global value outside of any lexical scope. */) ...@@ -629,7 +629,12 @@ global value outside of any lexical scope. */)
return (EQ (valcontents, Qunbound) ? Qnil : Qt); 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, DEFUN ("fboundp", Ffboundp, Sfboundp, 1, 1, 0,
doc: /* Return t if SYMBOL's function definition is not void. */) doc: /* Return t if SYMBOL's function definition is not void. */)
(register Lisp_Object symbol) (register Lisp_Object symbol)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment