* lisp/files.el (dir-locals-file): Allow wildcards

(dir-locals-find-file, dir-locals-collect-variables)
(dir-locals-read-from-file): Update accordingly.
(hack-dir-local-variables): Rename a local variable.

* lisp/emacs-lisp/map.el (map-merge-with): New function

* test/automated/map-tests.el (test-map-merge-with): New test

* lisp/emacs-lisp/cl-macs.el (cl-defstruct): Fix a bug

The defsubst was being created as:
    (cl-defsubst name (args) ("DOC") ...)

* test/automated/cl-lib-tests.el (cl-lib-struct-constructors): Add test

Update doc string of hexl-mode

* lisp/hexl.el (hexl-mode): Doc fix.  (Bug#21800)

Copyright-paperwork-exempt: yes

Fix error in copy-abbrev-table

* lisp/abbrev.el (define-abbrev): Don't erase the :abbrev-table-modiff
property of the abbrev-table.  (Bug#21828)

* test/automated/abbrev-tests.el: New file.

Add test to auto-revert-tests.el for Bug#21841

* test/automated/auto-revert-tests.el
(auto-revert-test01-auto-revert-several-files): New test.
(auto-revert-test02-auto-revert-tail-mode)
(auto-revert-test03-auto-revert-mode-dired): Rename them.

* doc/lispref/windows.texi (Coordinates and Windows): Fix typo.

In x_consider_frame_title don't set title of tooltip frames

* src/xdisp.c (x_consider_frame_title): Return immediately for
tooltip frames to avoid displaying empty tooltips.

Fixed NextStep fullscreen problem (bug#21770).

* nsterm.m (ns_constrain_all_frames): Don't constrain fullscreen
frames.

Ensure redisplay after evaluation

* lisp/progmodes/elisp-mode.el (elisp--eval-last-sexp): Revert
last change.
* lisp/frame.el (redisplay--variables): Populate the
redisplay--variables list.
* src/xdisp.c (maybe_set_redisplay): New function.
(syms_of_xdisp) <redisplay--variables>: New variable.
* src/window.h (maybe_set_redisplay): Declare prototype.
* src/data.c (set_internal): Call maybe_set_redisplay.  (Bug#21835)

* test/automated/subr-tests.el (subr-test-when): Fix again

Don't invoke overlay modification hooks in wrong buffer

* src/buffer.c (report_overlay_modification): When called with
AFTER non-zero, don't invoke overlay modification hooks if the
buffer recorded in last_overlay_modification_hooks is different
from the current buffer.  (Bug#21824)

* admin/notes/repo: Fix a few obsolete references to Bazaar

* test/automated/subr-tests.el (subr-test-when): Fix test

Avoid division by zero crash observed by Yuan MEI.

See http://lists.gnu.org/archive/html/emacs-devel/2015-11/msg00194.html.

* src/dispnew.c (required_matrix_height, required_matrix_width):
Avoid division by zero.
* src/xterm.c (x_term_init): Init dpyinfo->smallest_font_height and
dpyinfo->smallest_char_width to 1.

Ensure redisplay after "C-x C-e"

* lisp/progmodes/elisp-mode.el (elisp--eval-last-sexp): Make sure
redisplay happens to account for any side effects of the evaluated
sexp.  (Bug#21835)

; * CONTRIBUTE: Add section about the bug tracker

* CONTRIBUTE: Move less important sections after the more
important ones.  Add section about the bug tracker.

Skip some file notification tests for cygwin

* test/automated/file-notify-tests.el (file-notify--test-with-events):
Remove argument TIMEOUT.  Adapt all callees.
(file-notify-test02-events, file-notify-test04-file-validity):
Skip for cygwin.  (Bug#21804)

* lisp/progmodes/xref.el: require semantic/symref during compilation.

Suppress redundant Pinentry startup messages

* lisp/net/pinentry.el (pinentry-start): Add optional QUIET
argument.
* lisp/epg.el: Declare `pinentry-start'.
(epg--start): Call `pinentry-start' with QUIET argument set.

* doc/emacs/ack.texi (Acknowledgments): Updates.

* test/automated/elisp-mode-test.el: Silence some run-time warnings

(xref-elisp-deftest): Bind `find-file-suppress-same-file-warnings' to t.

Add prettify symbol for \times

* lisp/textmodes/tex-mode.el (tex--prettify-symbols-alist): Add
prettification support for \times.

* test/automated/process-tests.el: Skip tests when bash is not available

(process-test-sentinel-accept-process-output)
(process-test-sentinel-sit-for): skip-unless bash executable found.

Add test for bug #21831

* test/automated/process-tests.el
(start-process-should-not-modify-arguments): New test.  (Bug#21831)
Suggested by Nicolas Richard <youngfrog@members.fsf.org>

; Auto-commit of loaddefs files.

; * test/automated/elisp-mode-tests.el: Fix typo.

* lisp/emacs-lisp/eieio-compat.el: Typo caught by tests

(eieio--generic-static-object-generalizer): Fix typo.
* test/automated/eieio-tests.el: Byte-compile it again.
It looks like the underlying cause of bug#17852 was fixed in the mean time.

Revert "* lisp/subr.el (when): Use `macroexp-progn'"

This reverts commit 8e843831eaf271801836b7a3e4dd3b4fb0bb72b8.
It breaks bootstrapping (duh).

* lisp/files.el (report-errors): Obsolete

(normal-mode, hack-local-variables, dir-locals-find-file): Use
`with-demoted-errors' instead.

* lisp/subr.el (when): Use `macroexp-progn'

* test/automated/subr-tests.el (subr-test-when): New test

* lisp/progmodes/xref.el: Doc fixes

(xref-make-file-location, xref-make-buffer-location, xref-make)
(xref-make-bogus-location, xref-make-match): Add cross-references.
(xref--insert-xrefs): Fix typo in docstring.

Render fringe bitmaps correctly on NextStep (bug#21301).

The fringe bitmaps were inverted, the background was not transparent,
the image data was horizontally mirrored, and periodic fringe bitmaps
were not supported.

* nsimage.m ([EmacsImage initFromXBM:width:height:fg:bg:]): When
both background and foreground colors are 0, set the background
alpha channel to 0 (making the background transparent).  When
copying the image data, do this from the most significant bit
(leftmost) to the least (rightmost), to avoid mirroring.
* nsterm.m (ns_draw_fringe_bitmap): Don't invert the image bits. Add
support for periodic images (e.g. the empty line indicator).

* lisp/emacs-lisp/pcase.el (pcase): Tweak docstring.

* admin/MAINTAINERS: Add seq-tests.el, map-tests.el, and thunk-tests.el.

* admin/MAINTAINERS: Add thunk.el.

Change maintainer address.

* lisp/calc/calc (calc-bug-address): Change address.

; Shorten TODO list in file-notify-tests.el

Fix a stupid error in gfilenotify.c.

* src/gfilenotify.c (dir_monitor_callback): Cancel monitor only,
if we've got a `deleted' signal AND the file name is the watched one.

Fix Bug#21816; case insensitive file system in elisp-mode-tests.el

* test/automated/elisp-mode-tests.el (xref-elisp-test-run): Use
case-insensitive string compare for file names.
(emacs-test-dir): Add 'downcase' to cause case differences (at least on
my system).

Fix ChangeLog.2 entry for js-jsx-mode

flymake-tests.el (warning-predicate-rx-gcc): Fix check.

* test/automated/flymake-tests.el (warning-predicate-rx-gcc):
Also check that "make" is available, not just "gcc".

Document behavior of collation on Cygwin

* test/automated/fns-tests.el (fns-tests-collate-sort): Mark as
expected failure on Cygwin.
* doc/lispref/strings.texi (Text Comparison): Document that
punctuation and whitespace are not ignored for sorting on Cygwin.

* build-aux/msys-to-w32: Prevent double slashes in w32 path list.

* lisp/progmodes/f90.el (f90-no-block-limit):

Add associate.  (Bug#21794)
* test/automated/f90.el (f90-test-bug21794): New test.

Fix incompatibility with TCC in test for bug#18745

* test/automated/process-tests.el (process-test-quoted-batfile):
Remove spaces unrelated to the bug being tested.

; ChangeLog.2 fixes

Improve completion in tramp-gvfs.el

* lisp/net/tramp-gvfs.el (tramp-zeroconf-parse-device-names):
Renamed from `tramp-zeroconf-parse-service-device-names'.
(tramp-zeroconf-parse-webdav-device-names): Removed.  Code merged
with `tramp-zeroconf-parse-device-names'.
(tramp-gvfs-parse-device-names): New defun.
(top): Use it when `tramp-zeroconf-parse-device-names' is not
applicable.

* lisp/net/tramp.el (tramp-set-completion-function): The argument
could also be a zeroconf service type.

; Auto-commit of ChangeLog files.

; Auto-commit of loaddefs files.

; Fix ChangeLog.2 typos and style

ntlm.el: Change version to 2.0.0

Fix bug#21762

* lisp/progmodes/python.el (python-syntax-closing-paren-p): Check with
`eql' instead of `=' to accommodate the case that (syntax-after (point))
returns nil.

* test/automated/python-tests.el (python-indent-inside-paren-7):
New test.

* test/automated/python-tests.el: Avoid warnings

(python-tests-with-temp-buffer, python-tests-with-temp-file):
Bind `python-indent-guess-indent-offset' to nil.
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# Your branch is up-to-date with 'origin/master'.
#
# Changes to be committed:
# modified:   test/automated/python-tests.el
#

* src/alloc.c: Silence compiler warnings

(pointers_fit_in_lispobj_p, mmap_lisp_allowed_p): #ifdef DOUG_LEA_MALLOC.

* etc/NEWS: Fix js-jsx-mode entry punctuation

Add JSX indentation via js-jsx-mode.  (Bug#21799)

* progmodes/js.el: Add JSX indentation support.
(js-jsx-indent-line)
(js-jsx-mode): New functions.

Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

Minor fix in filenotify.el

* lisp/filenotify.el (file-notify--event-file-name)
(file-notify--event-file1-name): Normalize result with
`directory-file-name'.

Avoid errors in redisplay--pre-redisplay-functions

* lisp/emacs-lisp/cursor-sensor.el (cursor-sensor--detect): Don't
use 'bobp', instead compare window-point with 1.  (Bug#21730)

Merge from gnulib.

This incorporates:
2015-10-30 intprops: add WRAPV and const flavors for GCC 5
2015-10-25 stdalign: port to Sun C 5.9
* doc/misc/texinfo.tex, lib/intprops.h, lib/stdalign.in.h:
Copy from gnulib.

Fix a typo in a macro name

* src/w32proc.c (_NLSCMPERROR): Fix a typo in the name of this macro.
(w32_compare_strings): Adjust for the correction.

Add result messages in vc-tests.el

* test/automated/vc-tests.el (vc-test--state)
(vc-test--working-revision, vc-test--checkout-model): Add result messages.

* test/automated/faces-tests.el: Add another test

* lisp/faces.el (faces--attribute-at-point): Fix bug

introduced by previous commit.

* test/automated/faces-tests.el: New file

* lisp/faces.el: Refactor common code and fix a bug

(faces--attribute-at-point): New function.  Fix a bug when the
face at point is a list of faces and the desired attribute is not
on the first one.
(foreground-color-at-point, background-color-at-point): Use it.

* etc/tutorials/TUTORIAL.translators: Fix PL names

* lisp/character-fold.el: Provide `character-fold'

Add more faces for Gnus and ivy

* etc/themes/tsdh-dark-theme.el (tsdh-dark): add more faces for Gnus and
ivy.

Some minor fixes for tramp-gvfs.el

* lisp/net/tramp-gvfs.el (tramp-gvfs-handle-file-attributes):
An attribute returned by gvfs-info might be empty.  In case of
undetermined uid or gid, return "UNKNOWN" or -1, respectively.
(tramp-zeroconf-parse-service-device-names): New defun.
Derived from `tramp-zeroconf-parse-workstation-device-names'.
(top): Add completion functions for "afp" and "smb" methods.

* test/automated/character-fold-tests.el: New file

* test/automated/sort-tests.el: New file

Tests in this file are randomly generated and then tested with
regular, reverse, and case-fold sorting.

Describe known problems with pinning Emacs to taskbar

* etc/PROBLEMS: Describe the problem with pinning Emacs to taskbar
on Windows 10.  For the details, see the discussion starting at
http://lists.gnu.org/archive/html/help-emacs-windows/2015-09/msg00000.html.

* lisp/isearch.el: Avoid an error that blocks isearch

(isearch-update): Don't error if `isearch--current-buffer' has
been killed.

* test/automated/isearch-tests.el (isearch--test-update): New
file.

Fix documentation of 'beginning/end-of-buffer'

* lisp/simple.el (beginning-of-buffer, end-of-buffer): Clarify
conditions under which the mark will be pushed at the previous
position.  (Bug#21748)

Add RefTeX feature idea: editing RefTeX TOC buffers

More face defs for ivy, swiper, ace-window, eshell

* lisp/gnus/auth-source.el: Silence lexical-binding warnings

(auth-source-netrc-use-gpg-tokens): Simplify (symbol-value 'VAR) to
just VAR.
(auth-source-backend-parse): Use make-instance.
(auth-source-search): Remove unused key args.
Remove unused vars `accessor-key' and `backend'.  Avoid `eval'.
(auth-source-search-backends): Use slot names rather than their initarg.
(auth-source-netrc-create):
(auth-source-delete):
(auth-source-secrets-create, auth-source-plstore-search)
(auth-source-macos-keychain-create, auth-source-macos-keychain-search)
(auth-source-plstore-create, auth-source-netrc-search)
(auth-source-netrc-parse): Remove unused key args.
(auth-source-forget+): Simplify the arglist.
(auth-source-macos-keychain-search-items)
(auth-source-token-passphrase-callback-function): Mark unused args.
(auth-source-epa-extract-gpg-token): Remove unused var `plain'.
(pp-escape-newlines): Declare.
(auto-source--symbol-keyword): New function.
(auth-source-plstore-create, auth-source-netrc-create)
(auth-source-netrc-normalize): Use it.
(auth-source-netrc-search): Don't pass :delete to
auth-source-netrc-parse since it doesn't use it.
(auth-source-plstore-create, auth-source-netrc-create): Use plist-get
symbol-value to index in keyword args.
(auth-source-macos-keychain-result-append): Avoid setq.
(auth-source-netrc-create): Remove unused vars `file' and `add'.
(auth-source-user-or-password): Remove unused var `cname'.

; lisp/help-fns.el: Fix typos in comments

* lisp/dired.el (dired-unmark-all-files-query): Declare.

(dired-unmark-all-files): Let-bind it and use instead of ‘query’.
(Bug#21746)

* lisp/ielm.el (ielm-indent-line): Use non-nil arg of comint-bol

to go to the beginning of text line instead of command line.
http://lists.gnu.org/archive/html/emacs-devel/2015-10/msg02360.html

; * src/lread.c (syms_of_lread) <load-path>: Improve the doc string.

; Improve documentation of 'unhandled-file-name-directory'

* doc/lispref/files.texi (Magic File Names): Better wording for the
last change in the documentation of 'unhandled-file-name-directory'.

Fix encoding of saving *Help* buffers

* lisp/help-fns.el (describe-function-1): If we use curved quotes,
set help buffer's buffer-file-coding-system to UTF-8.  (Bug#21780)

* lisp/emacs-lisp/cl-generic.el: Add (major-mode MODE) context

(cl--generic-derived-specializers): New function.
(cl--generic-derived-generalizer): New generalizer.
(cl-generic-generalizers): New specializer (derived-mode MODE).
(cl--generic-split-args): Apply the rewriter, if any.
(cl-generic-define-context-rewriter): New macro.
(major-mode): Use it to define a new context-rewriter, so we can write
`(major-mode MODE)' instead of `(major-mode (derived-mode MODE))'.

* lisp/frame.el (window-system): New context-rewriter so we can write
`(window-system VAL)' instead of (window-system (eql VAL)).
(cl--generic-split-args): Apply the rewriter, if any.
(frame-creation-function): Use the new syntax.

* lisp/term/x-win.el (window-system-initialization)
(handle-args-function, frame-creation-function)
(gui-backend-set-selection, gui-backend-selection-owner-p)
(gui-backend-selection-exists-p, gui-backend-get-selection):
* lisp/term/w32-win.el (window-system-initialization)
(handle-args-function, frame-creation-function)
(gui-backend-set-selection, gui-backend-get-selection)
(gui-backend-selection-owner-p, gui-backend-selection-exists-p):
* lisp/term/pc-win.el (gui-backend-get-selection)
(gui-backend-selection-exists-p, gui-backend-selection-owner-p)
(gui-backend-set-selection, window-system-initialization)
(frame-creation-function, handle-args-function):
* lisp/term/ns-win.el (window-system-initialization)
(handle-args-function, frame-creation-function)
(gui-backend-set-selection, gui-backend-selection-exists-p)
(gui-backend-get-selection):
* lisp/startup.el (handle-args-function):
* lisp/term/xterm.el (gui-backend-get-selection)
(gui-backend-set-selection): Use the new syntax.

* test/indent/css-mode.css: Add tests for url(...) syntax.

* lisp/emacs-lisp/smie.el: Use `declare' for `pure'

(smie-precs->prec2, smie-merge-prec2s, smie-bnf->prec2, smie-prec2->grammar):
Use `declare'.

* lisp/emacs-lisp/cl-generic.el: Accomodate future changes

(cl--generic-generalizer): Add `name' field.
(cl-generic-make-generalizer): Add corresponding `name' argument.
(cl-generic-define-generalizer): New macro.
(cl--generic-head-generalizer, cl--generic-eql-generalizer)
(cl--generic-struct-generalizer, cl--generic-typeof-generalizer)
(cl--generic-t-generalizer): Use it.
(cl-generic-ensure-function): Add `noerror' argument.
(cl-generic-define): Use it so we don't follow aliases.
(cl-generic-define-method): Preserve pre-existing ordering of methods.
(cl--generic-arg-specializer): New function.
(cl--generic-cache-miss): Use it.
(cl-generic-generalizers): Only fset a temporary definition
during bootstrap.
(cl--generic-struct-tag, cl--generic-struct-specializers):
Allow extra arguments.

* lisp/emacs-lisp/eieio-compat.el (eieio--generic-static-symbol-generalizer)
(eieio--generic-static-object-generalizer): Use cl-generic-define-generalizer.
(eieio--generic-static-symbol-specializers): Allow extra arguments.

* lisp/emacs-lisp/eieio-core.el (eieio--generic-generalizer)
(eieio--generic-subclass-generalizer): Use cl-generic-define-generalizer.
(eieio--generic-subclass-specializers): Allow extra arguments.

* lisp/emacs-lisp/bytecomp.el (compile-defun): Add defvars in scope.

Add "afp" method to Tramp

* doc/misc/tramp.texi (GVFS based methods): Describe `afp' method.

* lisp/net/tramp-gvfs.el (tramp-gvfs-methods): Add "afp" method.
(tramp-gvfs-handle-expand-file-name)
(tramp-gvfs-handler-mounted-unmounted)
(tramp-gvfs-connection-mounted-p, tramp-gvfs-mount-spec)
(tramp-gvfs-maybe-open-connection): Support also "afp".
(tramp-gvfs-handle-file-attributes): Handle the case of empty
"owner::user" and "owner::group" entries.

Handle negative coordinates in ‘x_calc_absolute_position’

* src/w32term.c (x_calc_absolute_position): Find display origin to
allow for negative coordinates.

(internal--syntax-propertize): Save match-data here (bug#21766)

* lisp/emacs-lisp/syntax.el (internal--syntax-propertize): Save match-data.
* lisp/simple.el (delete-trailing-whitespace): Undo last change.

Don't require default-directory to end with a slash

* doc/lispref/files.texi (Magic File Names): Document the change
in unhandled-file-name-directory.

* lisp/url/url-handlers.el
(url-handler-unhandled-file-name-directory): Update accordingly.

* src/buffer.c (default-directory): Update the docsting.

* src/fileio.c (unhandled-file-name-directory): Default to calling
`file-name-as-directory'
(http://lists.gnu.org/archive/html/emacs-devel/2015-10/msg02294.html).

* lisp/isearch.el: Delete some outdated comments

Fix eshell/clear not working if the output has a small line count

* lisp/eshell/esh-mode.el: (eshell/clear): Use (window-size) as the
number of newlines to be inserted. This fixes the issue where
eshell/clear wouldn't work if the prompt was not at the bottom of the
window, and the output wasn't too long.

; * etc/NEWS: Document `search-default-regexp-mode'

* lisp/files.el (write-file): Use vc-refresh-state.

* lisp/autorevert.el (auto-revert-handler): Use vc-refresh-state.

* lisp/vc/pcvs.el (cvs-revert-if-needed): Use vc-refresh-state.