~ubuntu-elisp/emacs/+git/master:scratch/allow-custom-null-and-false-objects-in-jsonc

Branch merges

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

16a7bce... by =?utf-8?b?Sm/Do28gVMOhdm9yYQ==?= <email address hidden> on 2018-06-09

Merge branch 'master' into this scratch branch

scratch/allow-custom-null-and-false-objects-in-jsonc

4aed7ee... by =?utf-8?b?Sm/Do28gVMOhdm9yYQ==?= <email address hidden> on 2018-06-09

After Eli's doc review

38111b5... by =?utf-8?b?Sm/Do28gVMOhdm9yYQ==?= <email address hidden> on 2018-06-08

Describe flymake-start-on-save-buffer in manual and NEWS

Fixes: bug#31738

* doc/misc/flymake.texi (Using Flymake, Customizable variables):
Mention flymake-start-on-save-buffer.

* etc/NEWS: Mention flymake-start-on-save-buffer.

21c6534... by =?utf-8?b?Sm/Do28gVMOhdm9yYQ==?= <email address hidden> on 2018-06-08

New flymake-start-on-save-buffer custom variable

Fixes: bug#21419

* lisp/progmodes/flymake.el (flymake-after-save-hook): Use
flymake-start-on-save-buffer.
(flymake-start-on-save-buffer): New custom variable.
(flymake-start-on-flymake-mode): Tweak docstring.

fe06f64... by Alan Mackenzie on 2018-06-08

CC Mode: Fontify unbalanced quotes in unconstrained multiline strings, etc.

("Unconstrained" meaning that every string is multiline, without needing such
special marking as used by Pike Mode.)

* lisp/progmodes/cc-mode.el (c-pps-to-string-delim): Don't process the char
before BOB.
(c-multiline-string-check-final-quote): New function.
(c-bc-changed-stringiness): New variable.
(c-before-change-check-unbalanced-strings): Add handling for unconstrained
multiline strings.
(c-after-change-re-mark-unbalanced-strings): Add handling for unconstrained
multiline strings. Handle escaped double quotes more accurately.

db353b8... by Paul Eggert on 2018-06-08

Port alignment verification to x86 --with-wide-int

Problem reported by Eli Zaretskii in:
https://lists.gnu.org/r/emacs-devel/2018-06/msg00238.html
* src/lisp.h (struct Lisp_Symbol, union vectorlike_header)
(struct Lisp_Cons, struct Lisp_String):
Do not check alignment if !USE_LSB_TAG, as alignment is
needed only if we are tagging the low-order bits.

f09e9d2... by Michal Nazarewicz <email address hidden> on 2018-06-08

; Tiny tpyo fix

* src/xfaces.c (face-remapping-alist): remove an empty ‘(3)’ introduced
in a docstring by mistake.

416ba36... by Daniel Colascione on 2018-06-08

Offer to open large files without modes

* lisp/files.el:
(files--ask-user-about-large-file): New function.
(abort-if-file-too-large): Call it.
(find-file-noselect): Support new raw open.

9d447fa... by Daniel Colascione on 2018-06-07

Add support for per-window face remapping

Extend face specifications to support the notion of filtering to a
specific context and add a filter that limits a face specification to
windows having a certain parameter.

* src/xfaces.c:
(evaluate_face_filter,filter_face_ref): New functions.
(merge_face_ref): Ignore filtered face specifications.
(Fx_list_fonts,get_lface_attributes,merge_face_vectors)
(merge_named_face,merge_face_ref,merge_face_ref)
(Finternal_merge_in_global_face,Fface_font,lookup_named_face)
(lookup_basic_face,Fface_attributes_as_vector)
(x_supports_face_attributes_p)
(Fdisplay_supports_face_attributes_p,realize_named_face)
(compute_char_face,face_at_buffer_position)
(face_at_buffer_position,face_at_buffer_position)
(face_at_buffer_position)
(face_for_overlay_string,face_at_string_position,merge_faces):
Pass window to face machinery.
(syms_of_xfaces): Add :window and :filtered

* src/xdisp.c (init_iterator, handle_face_prop)
(handle_single_display_spec, merge_escape_glyph_face)
(merge_glyphless_glyph_face, get_next_display_element)
(next_element_from_display_vector, append_space_for_newline)
(extend_face_to_end_of_line,highlight_trailing_whitespace)
(maybe_produce_line_number)
(display_line, calc_line_height_property): Pass window to
face machinery.

* src/term.c (tty_menu_activate): Adjust to new face core
function signature.

* src/msdos.c (XMenuActivate): Adjust to new face core
function signature.

* src/fringe.c (draw_fringe_bitmap_1, Fset_fringe_bitmap_face):
Pass window to face machinery.

* src/font.c (font_range, Finternal_char_font): Pass window to
face machinery.

* src/dispnew.c (spec_glyph_lookup_face): Pass window to
face machinery.

* src/dispextern.h:
(lookup_named_face,lookup_basic_face)
(lookup_derived_face,merge_faces):
Add struct window arguments to prototypes.

e2a9800... by Paul Eggert on 2018-06-08

Fit kill_buffer_xwidgets into 80

* src/xwidget.c (kill_buffer_xwidgets): Reindent and use C99
style to fit in 80 columns.