* src/frame.c (Fhandle_switch_frame): Deactivate shift-region (bug#19003).
* lisp/window.el (handle-select-window): Deactivate shift-region.
Fix DocView slicing docs

* doc/emacs/misc.texi (DocView Slicing): Describe how to slice with the
mouse.  Fix command mentioned by slice by BoundingBox paragraph.
(Bug#18040)
Fix indentation before `!=' and after `+='

Originally reported in https://github.com/mooz/js2-mode/issues/174.
* lisp/progmodes/js.el (js--indent-operator-re): Make assignments and
(in)equality operator a separate case.
(js--continued-expression-p): Escape the second `+' in the regexp.
Prevent resizing the echo area when iPython is enabled

Fixes: debbugs:18794

* lisp/progmodes/python.el (python-eldoc--get-doc-at-point): Strip
shell output before returning.
Simplify and fix doc-related .gitignore files.

This fixes some unwanted 'git status' output after 'make docs'.
* .gitignore: Add **/Makefile, **/makefile.
Remove Makefile, makefile.
Add doc/*/*.xxx rules for the usual kinds of documentation outputs
and temporaries.  Add doc/misc/cc-mode.ss.
* doc/emacs/.gitignore, doc/lispref/.gitignore, doc/misc/.gitignore:
* lwlib/.gitignore, oldXMenu/.gitignore:
Remove, as these .gitignore files are no longer needed.
* doc/lispintro/.gitignore: Replace with list of exceptional PDF files.
Restore 'Bug#' -> 'debbugs:' rewrite in log-edit-mode.

* .dir-locals.el (log-edit-mode): Restore the (log-edit-rewrite-fixes
"[ \n](bug#\\([0-9]+\\))" . "debbugs:\\1").  See Glenn Morris in:
http://lists.gnu.org/archive/html/emacs-devel/2014-11/msg01187.html
Don't assume "bzr log" uses --long format by default.

 lisp/vc/vc-bzr.el (vc-bzr-print-log, vc-bzr-expanded-log-entry):
 Don't assume --long is the default for "bzr log", always specify
 it explicitly, in case the user defined an alias for 'log' that
 uses some other format.
Define MINGW_W64 and use it instead of _W64

... for detecting MinGW-w64. _W64 is not specific of MinGW-w64, it is
defined for compatibility with MS VC++.

	* nt/inc/ms-w32.h: Define MINGW_W64.

	* admin/CPP-DEFINES: Mention MINGW_W64.

	* nt/addpm.c: Use it.

	* nt/addsection.c: Use it.

	* nt/preprep.c: Use it.

	* src/w32.c: Use MINGW_W64 instead of _W64

	* src/w32term.c: Likewise.
Further eww dom.el cleanups

* net/eww.el (eww-tag-title): Use `dom-text'.

* dom.el (dom-by-tag): Use `equal' for comparisons so that tags
can be strings.
(dom-elements): Protect against non-text nodes.
(dom-non-text-children): New function.
* gnutls.c (Fgnutls_boot): Send the server name over

Fixes: debbugs:18208

* gnutls.c (Fgnutls_boot): Send the server name over (bug#18208).
Only send SNI if the host name is not an IP address

* gnutls.c (gnutls_ip_address_p): New function.
(Fgnutls_boot): Only send SNI if the host name is not an IP address.
* net/shr.el (shr-make-table-1): dom.el changes for table rendering.
Better display for `paranoid' `network-security-level'

* net/nsm.el (nsm-new-fingerprint-ok-p): Display the certificate
when querying about new certificates.
Gnus: fix XEmacs compilation
Merge branch 'emacs-24'

Conflicts:
	nt/addsection.c
	nt/inc/ms-w32.h
	src/w32.c
Replace uses of _W64 with MINGW_W64

This is the `master' branch follow-up to the change made previously on
the emacs-24 branch (81e0cca7bbc99dbfda898a8aaab740ae121cf045).

    * src/w32.c: Use MINGW_W64 instead of _W64.

    * src/w32heap.c: Likewise.
* NEWS: Mention dom.el.
Add a DOM pretty-printing function

* doc/lispref/text.texi (Document Object Model): Mention `dom-pp'.

* lisp/dom.el (dom-pp): New function.
Record the right URL in eww

* net/eww.el (eww): Record the new URL immediately, so that if the
HTTP fetch fails, we have the right URL in the buffer.
eww input field fixup

Fixes: debbugs:19085

(eww-process-text-input): Don't shorten the input field if
deleting at the last character.