Merge branch 'emacs-24'

Conflicts:
	nt/addsection.c
	nt/inc/ms-w32.h
	src/w32.c

27 files changed, 159 insertions, 112 deletions

diff --git a/.dir-locals.el b/.dir-locals.el
index afc68ea3ba..5e73e0d9ac 100644
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -3,7 +3,9 @@
          (fill-column . 70)))
  (c-mode . ((c-file-style . "GNU")))
  (objc-mode . ((c-file-style . "GNU")))
- (log-edit-mode . ((log-edit-font-lock-gnu-style . t)
+ (log-edit-mode . ((log-edit-rewrite-fixes
+                    "[ \n](bug#\\([0-9]+\\))" . "debbugs:\\1")
+                   (log-edit-font-lock-gnu-style . t)
                    (log-edit-setup-add-author . t)))
  (change-log-mode . ((add-log-time-zone-rule . t)
 		     (fill-column . 74)
diff --git a/.gitignore b/.gitignore
index 16b92c427a..4200d8a496 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+**/Makefile
+**/makefile
+
 configure
 aclocal.m4
 compile
@@ -9,7 +12,6 @@ missing
 lib/Makefile.in
 src/config.in
 autom4te.cache
-makefile
 TAGS
 *~
 .#*
@@ -24,7 +26,6 @@ info/dir
 info/*.info
 test/biditest.txt
 
-Makefile
 config.log
 config.status
 config.cache
@@ -72,9 +73,38 @@ src/stamp-h1
 src/temacs
 src/temacs.map
 src/temacs.tmp
-doc/emacs/emacsver.texi
-doc/man/emacs.1
-etc/refcards/emacsver.tex
+doc/*/*.aux
+doc/*/*.cm
+doc/*/*.cms
+doc/*/*.cp
+doc/*/*.cps
+doc/*/*.dvi
+doc/*/*.fn
+doc/*/*.fns
+doc/*/*.html
+doc/*/*.ky
+doc/*/*.kys
+doc/*/*.log
+doc/*/*.op
+doc/*/*.ops
+doc/*/*.pdf
+doc/*/*.pg
+doc/*/*.pgs
+doc/*/*.pj
+doc/*/*.pjs
+doc/*/*.ps
+doc/*/*.sc
+doc/*/*.scs
+doc/*/*.tg
+doc/*/*.tgs
+doc/*/*.tmp
+doc/*/*.toc
+doc/*/*.tp
+doc/*/*.tps
+doc/*/*.vr
+doc/*/*.vrs
+doc/*/texput.log
+doc/misc/cc-mode.ss
 lib/.deps/
 lisp/international/uni-brackets.el
 lwlib/deps/
diff --git a/ChangeLog b/ChangeLog
index 55c6778a96..0fc6be90b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2014-11-17  Paul Eggert  <eggert@cs.ucla.edu>
+
+	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
+
+	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/lispintro/.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.
+
 2014-11-26  Dani Moncayo  <dmoncayo@gmail.com>
 
 	* configure.ac [MINGW]: Fix the way of getting the right host
diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index a98d1b9039..18423c2342 100644
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -19,8 +19,9 @@ __MSDOS__	Ditto.
 __DJGPP_MINOR__ Minor version number of the DJGPP library; used only in msdos.c and dosfns.c.
 DOS_NT		Compiling for either the MS-DOS or native MS-Windows port.
 WINDOWSNT	Compiling the native MS-Windows (W32) port.
-__MINGW32__	Compiling the W32 port with the MinGW port of GCC.
+__MINGW32__	Compiling the W32 port with the MinGW or MinGW-w64 ports of GCC.
 _MSC_VER	Compiling the W32 port with the Microsoft C compiler.
+MINGW_W64	Compiling the W32 port with the MinGW-w64 port of GCC.
 DARWIN_OS	Compiling on Mac OS X or pure Darwin (and using s/darwin.h).
 SOLARIS2
 USG
diff --git a/admin/ChangeLog b/admin/ChangeLog
index cc69367555..6d134046a3 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-17  Oscar Fuentes  <ofv@wanadoo.es>
+
+	* admin/CPP-DEFINES: Mention MINGW_W64.
+
 2014-11-22  Glenn Morris  <rgm@gnu.org>
 
 	* admin.el (set-version): No more need to update nt/*.rc.
diff --git a/doc/emacs/.gitignore b/doc/emacs/.gitignore
deleted file mode 100644
index 3ff56b474d..0000000000
--- a/doc/emacs/.gitignore
+++ /dev/null
@@ -1,23 +0,0 @@
-*.aux
-*.cp
-*.cps
-*.dvi
-*.fn
-*.fns
-*.ky
-*.kys
-*.log
-*.op
-*.ops
-*.pdf
-*.pg
-*.pgs
-*.ps
-*.tmp
-*.toc
-*.tp
-*.tps
-*.vr
-*.vrs
-Makefile
-makefile
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index e608248b26..1ce7aa15ae 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,9 @@
+2014-11-16  Tassilo Horn  <tsdh@gnu.org>
+
+	* misc.texi (DocView Slicing): Describe how to slice with the
+	mouse.  Fix command mentioned by slice by BoundingBox paragraph.
+	(Bug#18040)
+
 2014-11-25  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* misc.texi (Network Security): Use "untrustworthy" instead of
diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index 5bd0fc88b4..39632cbe07 100644
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -525,12 +525,14 @@ and the slice's width and height.
 
   A more convenient graphical way to specify the slice is with @kbd{s
 m} (@code{doc-view-set-slice-using-mouse}), where you use the mouse to
-select the slice.
-@c ??? How does this work?
+select the slice.  Simply press and hold the left mouse button at the
+upper-left corner of the region you want to have in the slice, then
+move the mouse pointer to the lower-right corner and release the
+button.
 
   The most convenient way is to set the optimal slice by using
 BoundingBox information automatically determined from the document by
-typing @kbd{s b} (@code{doc-view-set-slice-using-mouse}).
+typing @kbd{s b} (@code{doc-view-set-slice-from-bounding-box}).
 
 @findex doc-view-reset-slice
   To cancel the selected slice, type @kbd{s r}
diff --git a/doc/lispintro/.gitignore b/doc/lispintro/.gitignore
index e1af5a918b..cf992dc864 100644
--- a/doc/lispintro/.gitignore
+++ b/doc/lispintro/.gitignore
@@ -1,21 +1,3 @@
-*.aux
-*.fn
-*.fns
-*.cps
-*.cp
-*.kys
-*.ky
-*.toc
-*.pgs
-*.pg
-*.log
-*.vrs
-*.vr
-*.dvi
-*.ps
-*.tp
-*.tps
-*.tmp
-*.txt
-Makefile
-makefile
+!cons-*.pdf
+!drawers.pdf
+!lambda-*.pdf
diff --git a/doc/lispref/.gitignore b/doc/lispref/.gitignore
deleted file mode 100644
index ba74d36599..0000000000
--- a/doc/lispref/.gitignore
+++ /dev/null
@@ -1,13 +0,0 @@
-texput.log
-elisp.??
-elisp.???
-config.log
-config.cache
-config.status
-Makefile
-makefile
-elisp
-elisp-?
-elisp-??
-elisp1* 
-elisp2*
diff --git a/doc/misc/.gitignore b/doc/misc/.gitignore
deleted file mode 100644
index 3ff56b474d..0000000000
--- a/doc/misc/.gitignore
+++ /dev/null
@@ -1,23 +0,0 @@
-*.aux
-*.cp
-*.cps
-*.dvi
-*.fn
-*.fns
-*.ky
-*.kys
-*.log
-*.op
-*.ops
-*.pdf
-*.pg
-*.pgs
-*.ps
-*.tmp
-*.toc
-*.tp
-*.tps
-*.vr
-*.vrs
-Makefile
-makefile
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 53414ed7a7..92b50d9888 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,27 @@
+2014-11-17  Eli Zaretskii  <eliz@gnu.org>
+
+	* 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.
+
+2014-11-16  Fabián Ezequiel Gallina  <fgallina@gnu.org>
+
+	* progmodes/python.el (python-eldoc--get-doc-at-point): Strip
+	shell output before returning.  (bug#18794)
+
+2014-11-16  Dmitry Gutov  <dgutov@yandex.ru>
+
+	Fix indentation before `!=' and after `+='.  Originally reported
+	in https://github.com/mooz/js2-mode/issues/174.
+	* 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.
+
+2014-11-16  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* window.el (handle-select-window): Deactivate shift-region (bug#19003).
+
 2014-11-26  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* net/nsm.el (nsm-new-fingerprint-ok-p): Display the certificate
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index d7017e9eed..c2c45aa4ef 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -1685,7 +1685,7 @@ This performs fontification according to `js--class-styles'."
   "Regular expression matching variable declaration keywords.")
 
 (defconst js--indent-operator-re
-  (concat "[-+*/%<>=&^|?:.]\\([^-+*/]\\|$\\)\\|"
+  (concat "[-+*/%<>&^|?:.]\\([^-+*/]\\|$\\)\\|!?=\\|"
           (js--regexp-opt-symbol '("in" "instanceof")))
   "Regexp matching operators that affect indentation of continued expressions.")
 
@@ -1712,7 +1712,7 @@ This performs fontification according to `js--class-styles'."
                     (save-excursion (backward-char) (not (looking-at "[/*]/")))
                     (js--looking-at-operator-p)
 		    (and (progn (backward-char)
-				(not (looking-at "++\\|--\\|/[/*]"))))))))))
+				(not (looking-at "+\\+\\|--\\|/[/*]"))))))))))
 
 
 (defun js--end-of-do-while-loop-p ()
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 3e204a92cd..9680a4aa9d 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -3615,9 +3615,12 @@ returns will be used.  If not FORCE-PROCESS is passed what
       (let ((input (or force-input
                        (python-info-current-symbol t))))
         (and input
-             (python-shell-send-string-no-output
-              (format python-eldoc-string-code input)
-              process))))))
+             ;; Prevent resizing the echo area when iPython is
+             ;; enabled.  Bug#18794.
+             (python-util-strip-string
+              (python-shell-send-string-no-output
+               (format python-eldoc-string-code input)
+               process)))))))
 
 (defun python-eldoc-function ()
   "`eldoc-documentation-function' for Python.
diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el
index 073c355df6..471c4799ca 100644
--- a/lisp/vc/vc-bzr.el
+++ b/lisp/vc/vc-bzr.el
@@ -720,7 +720,7 @@ If LIMIT is non-nil, show no more than this many entries."
   (with-current-buffer buffer
     (apply 'vc-bzr-command "log" buffer 'async files
 	   (append
-	    (when shortlog '("--line"))
+	    (if shortlog '("--line") '("--long"))
 	    ;; The extra complications here when start-revision and limit
 	    ;; are set are due to bzr log's --forward argument, which
 	    ;; could be enabled via an alias in bazaar.conf.
@@ -755,7 +755,7 @@ If LIMIT is non-nil, show no more than this many entries."
 (defun vc-bzr-expanded-log-entry (revision)
   (with-temp-buffer
     (apply 'vc-bzr-command "log" t nil nil
-	   (list (format "-r%s" revision)))
+	   (list "--long" (format "-r%s" revision)))
     (goto-char (point-min))
     (when (looking-at "^-+\n")
       ;; Indent the expanded log entry.
diff --git a/lisp/window.el b/lisp/window.el
index 78257b6121..b1acd93926 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -7800,7 +7800,7 @@ is active.  This function is run by `mouse-autoselect-window-timer'."
 
 (defun handle-select-window (event)
   "Handle select-window events."
-  (interactive "e")
+  (interactive "^e")
   (let ((window (posn-window (event-start event))))
     (unless (or (not (window-live-p window))
 		;; Don't switch if we're currently in the minibuffer.
diff --git a/lwlib/.gitignore b/lwlib/.gitignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/lwlib/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/nt/ChangeLog b/nt/ChangeLog
index 01dc0b1fee..ae292add9c 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,13 @@
+2014-11-17  Oscar Fuentes  <ofv@wanadoo.es>
+
+	* inc/ms-w32.h: Define MINGW_W64.
+
+	* nt/addpm.c: Use it.
+
+	* nt/addsection.c: Use it.
+
+	* nt/preprep.c: Use it.
+
 2014-11-24  Glenn Morris  <rgm@gnu.org>
 
 	* Makefile.in (../src/emacs.res): New target.
diff --git a/nt/addpm.c b/nt/addpm.c
index 18057b58b4..f7cfba39d0 100644
--- a/nt/addpm.c
+++ b/nt/addpm.c
@@ -38,9 +38,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <stdio.h>
 #include <malloc.h>
 
-/* MinGW64 defines _W64 and barfs if _WIN32_IE is defined to anything
-   below 0x500.  */
-#ifndef _W64
+/* MinGW64 barfs if _WIN32_IE is defined to anything below 0x500.  */
+#ifndef MINGW_W64
 #define _WIN32_IE 0x400
 #endif
 /* Request C Object macros for COM interfaces.  */
diff --git a/nt/inc/ms-w32.h b/nt/inc/ms-w32.h
index edb143c68d..e54ab87c7e 100644
--- a/nt/inc/ms-w32.h
+++ b/nt/inc/ms-w32.h
@@ -26,6 +26,16 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <mingw_time.h>
 
+/* MinGW-w64 gcc does not automotically define a macro for
+   differentiating it fom MinGW gcc. We need to test the presence of
+   __MINGW64_VERSION_MAJOR in _mingw.h: */
+#ifdef __MINGW32__
+# include <_mingw.h>
+# ifdef __MINGW64_VERSION_MAJOR
+#  define MINGW_W64
+# endif
+#endif
+
 /* #undef const */
 
 /* Number of chars of output in the buffer of a stdio stream. */
@@ -139,8 +149,7 @@ extern char *getenv ();
    versions we still support.  MinGW64 defines this to a higher value
    in its system headers, and is not really compatible with values
    lower than 0x0500, so leave it alone.  */
-#ifndef _W64
-# undef _WIN32_WINNT
+#ifndef MINGW_W64
 # define _WIN32_WINNT 0x0400
 #endif
 
@@ -167,7 +176,7 @@ extern char *getenv ();
 
 #ifdef emacs
 
-#ifdef _W64
+#ifdef MINGW_W64
 /* MinGW64 specific stuff.  */
 /* Make sure 'struct timespec' and 'struct timezone' are defined.  */
 #include <sys/types.h>
@@ -370,7 +379,7 @@ typedef int sigset_t;
 typedef int ssize_t;
 #endif
 
-#ifdef _W64	/* MinGW64 */
+#ifdef MINGW_W64
 #ifndef _POSIX
 typedef _sigset_t sigset_t;
 #endif
diff --git a/nt/preprep.c b/nt/preprep.c
index fda937df0e..39a9b70e95 100644
--- a/nt/preprep.c
+++ b/nt/preprep.c
@@ -25,7 +25,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 #include <stdio.h>
 #include <fcntl.h>
 #include <time.h>
-#if defined(__GNUC__) && !defined(_W64)
+#if defined(__GNUC__) && !defined(MINGW_W64)
 #define _ANONYMOUS_UNION
 #define _ANONYMOUS_STRUCT
 #endif
diff --git a/oldXMenu/.gitignore b/oldXMenu/.gitignore
deleted file mode 100644
index f3c7a7c5da..0000000000
--- a/oldXMenu/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/src/ChangeLog b/src/ChangeLog
index df704efdf2..e6bbeb8b86 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2014-11-17  Oscar Fuentes  <ofv@wanadoo.es>
+
+	* src/w32.c: Use MINGW_W64 instead of _W64.
+
+	* src/w32term.c: Likewise.
+
+2014-11-16  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* frame.c (Fhandle_switch_frame): Deactivate shift-region (bug#19003).
+
 2014-11-26  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* gnutls.c (gnutls_ip_address_p): New function.
diff --git a/src/frame.c b/src/frame.c
index 88f3d1f4fa..eaab63a0ea 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -1194,7 +1194,7 @@ This function returns FRAME, or nil if FRAME has been deleted.  */)
   return do_switch_frame (frame, 1, 0, norecord);
 }
 
-DEFUN ("handle-switch-frame", Fhandle_switch_frame, Shandle_switch_frame, 1, 1, "e",
+DEFUN ("handle-switch-frame", Fhandle_switch_frame, Shandle_switch_frame, 1, 1, "^e",
        doc: /* Handle a switch-frame event EVENT.
 Switch-frame events are usually bound to this function.
 A switch-frame event tells Emacs that the window manager has requested
diff --git a/src/w32.c b/src/w32.c
index f014cd73a7..ca5e14bc60 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -151,7 +151,7 @@ typedef struct _PROCESS_MEMORY_COUNTERS_EX {
 #define SDDL_REVISION_1	1
 #endif	/* SDDL_REVISION_1 */
 
-#if defined(_MSC_VER) || defined(_W64)
+#if defined(_MSC_VER) || defined(MINGW_W64)
 /* MSVC and MinGW64 don't provide the definition of
    REPARSE_DATA_BUFFER and the associated macros, except on ntifs.h,
    which cannot be included because it triggers conflicts with other
diff --git a/src/w32term.c b/src/w32term.c
index c2a37d078a..94b332b929 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -101,10 +101,10 @@ extern Cursor w32_load_cursor (LPCTSTR name);
 struct w32_display_info one_w32_display_info;
 struct w32_display_info *x_display_list;
 
-#if _WIN32_WINNT < 0x0500 && !defined(_W64)
+#if _WIN32_WINNT < 0x0500 && !defined(MINGW_W64)
 /* Pre Windows 2000, this was not available, but define it here so
    that Emacs compiled on such a platform will run on newer versions.
-   MinGW64 (_W64) defines these unconditionally, so avoid redefining.  */
+   MinGW64 defines these unconditionally, so avoid redefining.  */
 
 typedef struct tagWCRANGE
 {
diff --git a/test/indent/js.js b/test/indent/js.js
index d623a0dc5b..1924094e9d 100644
--- a/test/indent/js.js
+++ b/test/indent/js.js
@@ -47,3 +47,11 @@ var p = {
 
 var evens = [e for each (e in range(0, 21))
                if (ed % 2 == 0)];
+
+!b
+  !=b
+  !==b
+
+a++
+b +=
+  c