GitLab

* nxml-mode.el (nxml-comment-quote-nested): New function
(nxml-mode): Set comment-quote-nested-function

* newcomment.el (comment-quote-nested-function): New variable.
(comment-quote-nested-default): New function.
(comment-quote-nested): Use `comment-quote-nested-function'.

* src/macfont.m (macfont_set_family_cache):
* src/nsterm.m (append2):
* src/xterm.c (x_cr_export_frames):
Prefer CALLN to allocating the arg arrays by hand.

* test/automated/file-notify-tests.el (file-notify-test02-events):
Create a new watch for every test.

* lisp/filenotify.el (file-notify-add-watch): Append `flags' to
`gfile-add-watch' call.
(file-notify-rm-watch): Modify `file-notify-descriptors' only
after calling the low level functions.

* src/gfilenotify.c (dir_monitor_callback): Check, whether
event_type is expected.
(Fgfile_add_watch): Allow also `change'and `attribute-change' for FLAGS.
(Fgfile_rm_watch): Fix typo.
(syms_of_gfilenotify): Declare Qchange and Qattribute_change.

* src/syntax.c (parse_sexp_propertize): Handle spurious
e_property_truncated flag.
(update_syntax_table_forward): Remove invalid assertion.

* src/xdisp.c (produce_stretch_glyph): Support ':relative-width'
space display spec on text-mode terminals, by calling
PRODUCE_GLYPHS instead of x_produce_glyphs.  Remove the HAVE_WINDOW_SYSTEM
guards from the supporting code, as well as the test for a GUI frame.

This fixes the bootstrapping problem of `let-when-compile' using
`cl-progv' while being in subr.el (i.e. before cl stuff was loaded).

* lisp/url/url-http.el (url-http-parse-headers): Do not
automatically include Authorization header in redirect.
(Bug#21350)

* doc/lispref/display.texi (Specified Space): Document that
':relative-width' is only supported on GUI frames.

* src/indent.c (check_display_width): Support ':relative-width'
in a display spec that specifies a stretch glyph.  (Bug#21533)

... to conform better to CONTRIBUTE guidelines.

* lisp/emacs-lisp/smie.el (smie-rules-function): Document new
`empty-line-token' element.
(smie-indent-empty-line): New function.
(smie-indent-functions): Add it.

* lisp/progmodes/prolog.el (prolog-smie-rules): Fix :list-intro behavior
and use the new `empty-line-token' element (bug#21526).
(prolog-mode-variables): Fix comment-start-skip setting to match
comment-start.

* test/indent/prolog.prolog: Add nested indentation tests.

* lisp/newcomment.el (comment-normalize-vars): Fix default value of
comment-start-skip not to misuse submatch 1.

Fixes debbugs#21365.

dec/lispref/edebug.texi (Edebug Execution Modes): Change the
desscription
of `edebug-initial-mode' from that of its implementation to that of its
visual effect and use.  Move the paragraph higher up.

* lisp/progmodes/gud.el (gud-format-command): Don't use Tramp internal
functions 'tramp-file-name-localname' and 'tramp-dissect-file-name'.

* lisp/filenotify.el (file-notify-callback): Fix typo.
(gfile-valid-p): Remove defalias.

* src/gfilenotify.c (dir_monitor_callback): Cancel the monitor if
the file or directory to be watched is deleted.
(Fgfile_add_watch): Make watch_object a triple.
(Fgfile_rm_watch): Check, whether watch is cancelled already.
(Fgfile_valid_p): New defun.
(syms_of_gfilenotify): Declare Sgfile_valid_p.

* src/process.c (wait_reading_process_output): Remove channel from
Available set if it is handled by a callback, e.g., dbus or
inotify (bug#21313).

* lisp/textmodes/tex-mode.el (tex--prettify-symbols-alist): Add
\varepsilon using GREEK SMALL LETTER EPSILON, and change \epsilon to use
GREEK LUNATE EPSILON SYMBOL

* lisp/progmodes/prolog.el (prolog-find-unmatched-paren): Use innermost
rather than outermost paren (bug#21526).

Problem reported by Alan Mackenzie in:
http://lists.gnu.org/archive/html/emacs-devel/2015-09/msg00826.html
* .gitattributes (*.el, *.texi): New patterns.
* autogen.sh: Configure diff.elisp.xfuncname and
diff.texinfo.xfuncname if using Git.

* lisp/replace.el:
* lisp/textmodes/rst.el:
* lisp/whitespace.el: Add an explicit UTF-8 encoding tag.

* doc/lispref/nonascii.texi (Character Properties)
More-detailed commentary for \u escapes.
* lisp/progmodes/python.el (python--prettify-symbols-alist):
* lisp/replace.el (query-replace-from-to-separator):
* lisp/textmodes/rst.el (rst-bullets, rst-re-alist-def)
(rst-mode-syntax-table):
* lisp/whitespace.el (whitespace-display-mappings):
Prefer actual character to \u escape when this makes the code
easier to follow in the usual case where Unicode chars can be
displayed.

* src/xdisp.c (face_before_or_after_it_pos): Use do-while rather
than while loop to avoid GCC -Wmaybe-uninitialized diagnostic with
charpos.  The loop should always execute at least once anyway.

* lisp/textmodes/reftex-cite.el (reftex-extract-bib-entries): Signal an
error when the user tries searching with a regexp matching the empty
string.

* test/automated/file-notify-tests.el (file-notify-test02-events):
Further adaptation for w32notify: reduce the number of expected
'changed' events.  (Bug#21435)

* doc/lispref/os.texi (File Notifications): w32notify does not
send `attribute-changed' events.

* test/automated/file-notify-tests.el (file-notify--test-with-events):
Simplify parameters.  Adapt all callees.
(file-notify-test02-events): w32notify does not send
`attribute-changed' events.
(file-notify-test04-file-validity, file-notify-test05-dir-validity):
Do not skip in case of w32notify.  Simply ignore this part of the test.

* lisp/progmodes/gud.el (gud-format-command): Send localized file
names to the debugger running on the remote.  (Bug#13304)

* lisp/emacs-lisp/seq.el (seq-find): Improve the docstring and rename
the parameter `sentinel' to `default'.

* doc/lispref/sequences.texi (Sequence Functions): Update the
  documentation for `seq-find' accordingly.

* src/xdisp.c (face_before_or_after_it_pos): Fix calculation of
the previous string/buffer character position under bidi
iteration.  (Bug#21428)

* src/nsterm.m (x_set_window_size): Keep upper frame edge unchanged
(Bug#21415).

(prolog-smie-rules): Accomodate standard if/then/else special indentation.
(prolog-mode): Add . to electric-indent-chars.
(prolog-electric--if-then-else): Re-indent the line before adding space
after the new char (bug#21526).

lisp/progmodes/python.el (python-prettify-symbols-alist): New variable
lisp/progmodes/python.el (python-mode): Use it

* lisp/progmodes/compile.el (compilation-error-regexp-alist-alist):
Make guile-file a bit less enthusiastic (bug#21496).

Copyright-paperwork-exempt: yes

* lisp/progmodes/m4-mode.el (m4-font-lock-keywords): Fix recognition
of commands when they have a "m4_" prefix.