procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from origin/emacs-25

Browse source 
9a41cd1 ; Fix typo
9356fe2 Expand FIXME near definition of fboundp
219b39f kill-rectangle should mention killed-rectangle
59fa4c3 Avoid assertion violations in nhexl-mode
This commit is contained in:
Paul Eggert 2016-08-05 14:09:09 -07:00
commit a855bf48d4
3 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lisp/rect.el
View file

@ -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)

14
src/bidi.c
View file

@ -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);

7
src/data.c
View file

@ -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)