GitLab

* src/eval.c (Frun_hook_with_args, Frun_hook_with_args_until_success)
(Frun_hook_with_args_until_failure): Doc fixes.

* image.c (define_image_type): Avoid adding duplicate types to
image_types.  Suggested by Jörg Walter.

* src/eval.c (Frun_hook_with_args_until_success)
(Frun_hook_with_args_until_failure): Doc fixes.

Fixes: debbugs:2042

* fileio.c (Ffile_selinux_context): Only call freecon when
lgetfilecon succeeded.
(Fset_file_selinux_context): Likewise.

 src/xdisp.c (compute_stop_pos_backwards): Fix a typo that caused crashes while
 scrolling through multibyte text.

 src/xdisp.c (try_window_reusing_current_matrix): Under bidi
 reordering, locate the cursor by calling set_cursor_from_row; if
 that fails, clear the desired glyph matrix before returning a
 failure indication to the caller.  Fixes leaving garbled display
 when fast scrolling with a down-key when scroll-margin is non-zero.

does not become zero.  Backport from trunk.

Fixes: debbugs:12234

Fixes: debbugs:12418

* lisp/emacs-lisp/shadow.el (load-path-shadows-font-lock-keywords):
Be more robust about locating simple.el.

pattern.

Fixes: debbugs:12188

Fixes: debbugs:12382

* lisp/emulation/cua-rect.el (cua--init-rectangles):
* lisp/textmodes/picture.el (picture-mode-map):
* lisp/play/blackbox.el (blackbox-mode-map):
Remap right-char and left-char like forward-char and backward-char.

(Not worth a :version bump.)

Fixes: debbugs:12222

See: http://debbugs.gnu.org/12220

Fixes: debbugs:12223

See: http://debbugs.gnu.org/12267

 src/ralloc.c (free_bloc): Don't dereference a 'heap' structure if it
 is not one of the heaps we manage.

buffer-local; add delete-trailing-whitespace.

Fixes: debbugs:12259

Fixes: debbugs:11951

  buffer local setting.

Do not merge to trunk.