* 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.

* lisp/emacs-lisp/macroexp.el: Tweak macroexp-if optimizations

(macroexp-unprogn): Make sure we never return an empty list.
(macroexp-if): Remove unused (and unsafe) optimization.
Optimize (if A T (if B T E)) into (if (or A B) T E) instead, which does
occur occasionally.

Fix bug#21766 and add test

* lisp/simple.el (delete-trailing-whitespace): Save match data when
calling `skip-syntax-backward'.
* test/automated/simple-test.el (simple-delete-trailing-whitespace):
New test.

* doc/lispref/sequences.texi (Sequence Functions): Fix typo

* src/dispnew.c (init_display): Simplify overflow checking.

* lisp/character-fold.el (character-fold-to-regexp): Fix case

where string ends in space

* lisp/emacs-lisp/seq.el (seq-mapn): New function

* doc/lispref/sequences.texi (Sequence Functions): Document seq-mapn

* lisp/character-fold.el: Make compatible with lax-whitespace

(character-fold-to-regexp): Rework internals to play nice with
lax-whitespacing.

When the user types a space, we want to match the table entry for
?\s, which is generally a regexp like "[ ...]".  However, the
`search-spaces-regexp' variable doesn't "see" spaces inside these
regexp constructs, so we need to use "\\( \\|[ ...]\\)" instead (to
manually expose a space).

Furthermore, the lax search engine acts on a bunch of spaces, not
on individual spaces, so if the string contains sequential spaces
like "  ", we need to keep them grouped together like this:
"\\(  \\|[ ...][ ...]\\)".

* lisp/isearch.el: Refactor momentary messages

(isearch--momentary-message): New function.
(isearch-toggle-lax-whitespace, isearch-toggle-case-fold)
(isearch-toggle-invisible): Use it.

* lisp/isearch.el: Define all toggles with `isearch-define-mode-toggle'

(isearch-define-mode-toggle): New macro.
(isearch-toggle-invisible): Renamed to
`isearch-define-mode-toggle'.
(isearch-toggle-case-fold, isearch-toggle-invisible)
(isearch-toggle-regexp, isearch-toggle-lax-whitespace): Define
with `isearch-define-mode-toggle'.

Avoid using `add-to-list' on a let-local var in tramp-smb.el

* lisp/net/tramp-compat.el (tramp-compat-delete-dups): New defun.
* lisp/net/tramp-smb.el (tramp-smb-handle-directory-files): Use it.

Merge branch 'master' of /Volumes/HD2/build/emacs-git-ssh

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

Merge branch 'master' of /Volumes/HD2/build/emacs-git-ssh

Revert 692bce5b9eccfae19ae2a5a23a9ccd8d6bf86076

* lisp/net/tramp-smb.el (tramp-smb-handle-directory-files):
Revert 692bce5b9eccfae19ae2a5a23a9ccd8d6bf86076, `delete-dups'
does not exist in XEmacs 21.4.

Fixed OS X startup crash.

Input events started to arrive before ns_term_init() was finished.
Solved by blocking input. This also seems to correct the "You
can't open the application "Emacs" because it may be damaged or
incomplete" error issued when double-clicking on the Emacs
application.

* nsterm.m (ns_constrain_all_frames, ns_init_term): Block input.
* nsterm.m (ns_send_appdefined, EmacsApp): Trace output.

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

* src/process.c (Fget_buffer_process): Improve docstring

Document the fact that it doesn't return dead processes.

Fix incorrect NextStep tool-bar-mode -- wrong number of rows in frame.

* nsterm.h (struct ns_output): New flag, in_animation.
* nsfns.m (Fx_create_frame): Initialize in_animation flag.
* nsmenu.m (free_frame_tool_bar, update_frame_tool_bar): Set
in_animation flag around call to "setVisible". Set new tool bar
height before call to setVisible.
* nsterm.m (x_set_window_size): Don't call [view setRow:
andColumns:] as this fools the subsequent call to updateFrameSize
from performing the real resize.
(windowDidResize): Don't update anything when in_animation is
non-zero.

Trace output.

* nsmenu.m (free_frame_tool_bar, update_frame_tool_bar)
(EmacsToolbar):
* nsterm.m (x_set_window_size, updateFrameSize)
([EmacsView setRows: andColumns:])

* lisp/emacs-lisp/thunk.el (thunk-delay): Fix the macro.

Prettify TeX macros not ending in a word char

* lisp/textmodes/tex-mode.el (tex--prettify-symbols-compose-p): Prettify
macros which don't end in a word character.

; Revert "Don't declare vc-exec-after anymore"

This reverts commit 5e4395544c184d9a8702cf05c7aee9329b0b9482.

(http://lists.gnu.org/archive/html/emacs-devel/2015-10/msg02009.html)

Pipe Hg commit descriptions through 'tabindent'

* lisp/vc/vc-hg.el (vc-hg-log-format): Pipe commit description
through 'tabindent'.
(vc-hg-log-view-mode): Set tab-width to 2 locally.
(http://lists.gnu.org/archive/html/emacs-devel/2015-10/msg02259.html)

* lisp/net/tramp-smb.el: Avoid using `add-to-list' on a let-local var

* lisp/net/tramp-smb.el (tramp-smb-handle-directory-files): Use `delete-dups'.
* lisp/net/tramp.el (auto-save-file-name-transforms): Declare.

* lisp/international/ccl.el: Use lexical-binding

(ccl-compile-if): Remove unused var `false-ic'.
(ccl-compile-write-repeat): Remove unused var `i'.
(ccl-compile-map-single): Remove unused var `id'.
(ccl-dump, ccl-dump-binary): Use explicit let-binding to bind the
dynamic var `ccl-code'.

* lisp/json.el (json-new-object): Optimize trivial `list' call

* lisp/help.el: Fix bug with incorrect arglist string

(help-add-fundoc-usage): Don't mistake a mis-formatted string for a list.

* lisp/gnus/gnus-topic.el: Silence some warnings

(gnus-topic-prepare-topic): Remove unused var `topic'.
(gnus-topic-remove-topic): Mark unused arg `hide'.
(gnus-tmp-header): Declare.
(gnus-topic-goto-missing-group): Remove unused var `entry'.
(gnus-topic-unmark-topic): Mark unused arg `dummy'.
(gnus-topic-copy-matching): Mark unused arg `copyp'.
Move initialization of `topic' into its declaration.

Minor CEDET fixes

* lisp/cedet/cedet-global.el (cedet-gnu-global-gtags-call): Handle
warnings from gtags about invalid options.
(cedet-gnu-global-create/update-database): Do incremental update
properly.

* lisp/cedet/ede/generic.el (ede-enable-generic-projects): Get monotone
root right.

; Fix comments in file-notify-tests.el

Fall back to polling in autorevert when needed

* lisp/autorevert.el (auto-revert-notify-handler): When a
`stopped' event arrives from file notification, fall back to polling.

* test/automated/file-notify-tests.el
(file-notify-test03-autorevert): Extend test for polling when file
notification ceases to work.