Merge from origin/emacs-25

d4b93e1 Minor fixes in global-auto-composition-mode
02b037b Allow arithmetic operators inside C++ template constructs.
44b16f6 Avoid crashes in semi-malformed 'condition-case'
652e5b4 Allow arithmetic operators inside C++ template constructs.
d9ea795 Fix regression with 'recent-keys' and keyboard macros
903603f Fix wording in a doc-view.el comment
cf79616 ; Spelling fixes
f8bf1b3 CONTRIBUTE cleanups and updates
f3aaca3 Port USE_STACK_LISP_OBJECTS fix to Clang
1834ac7 Port to x86 GCC 4.3.1 and earlier
8482949 Fix point movement under 'scroll-conservatively'
c1313b5 Replace colon in file name (not legal on Windows)
f7af26c Fix a typo in edt.texi
8badf95 Make 'mmap_realloc' on MS-Windows more reliable
856cd94 Grep alias `all' shall not match parent directory

9 files changed, 64 insertions, 19 deletions

diff --git a/lisp/ChangeLog.13 b/lisp/ChangeLog.13
index 041e8c0c86b..d792889b3b7 100644
--- a/lisp/ChangeLog.13
+++ b/lisp/ChangeLog.13
@@ -7656,7 +7656,7 @@
 2007-11-07  Glenn Morris  <rgm@gnu.org>
 
         * emulation/tpu-mapper.el (tpu-map-key): Use unless rather than cond.
-        Remove superfluous concats.  Move final set-buffer to
+        Remove superfluous concatenations.  Move final set-buffer to
         non-emacs-specific code.
 
 2007-11-07  Rob Riepel  <riepel@networking.stanford.edu>
diff --git a/lisp/ChangeLog.17 b/lisp/ChangeLog.17
index 1785a336732..ee03661ece0 100644
--- a/lisp/ChangeLog.17
+++ b/lisp/ChangeLog.17
@@ -1758,7 +1758,7 @@
 
         * net/shr.el (shr-insert): Make sure the space inserted has the
         right font (for width).
-        (shr-fill-line): Preserve background colours when indenting/folding.
+        (shr-fill-line): Preserve background colors when indenting/folding.
         (shr-ensure-paragraph): Don't insert a new paragraph as the first
         item in a <li>.
 
diff --git a/lisp/composite.el b/lisp/composite.el
index 205f5ed3712..94b14dfc94a 100644
--- a/lisp/composite.el
+++ b/lisp/composite.el
@@ -838,6 +838,7 @@ omitted or nil.
 
 For more information on Auto Composition mode, see
 `auto-composition-mode' ."
+  :global t
   :variable (default-value 'auto-composition-mode))
 
 (defalias 'toggle-auto-composition 'auto-composition-mode)
diff --git a/lisp/doc-view.el b/lisp/doc-view.el
index 06cf8dcef3a..af7f1996cc5 100644
--- a/lisp/doc-view.el
+++ b/lisp/doc-view.el
@@ -140,6 +140,7 @@
 (require 'dired)
 (require 'image-mode)
 (require 'jka-compr)
+(require 'subr-x)
 
 ;;;; Customization Options
 
@@ -695,14 +696,19 @@ It's a subdirectory of `doc-view-cache-directory'."
     (setq doc-view--current-cache-dir
           (file-name-as-directory
            (expand-file-name
-            (concat (subst-char-in-string ?% ?_ ;; bug#13679
-                     (file-name-nondirectory doc-view--buffer-file-name))
-                    "-"
-                    (let ((file doc-view--buffer-file-name))
-                      (with-temp-buffer
-                        (set-buffer-multibyte nil)
-                        (insert-file-contents-literally file)
-                        (md5 (current-buffer)))))
+            (concat (thread-last
+                        (file-name-nondirectory doc-view--buffer-file-name)
+                      ;; bug#13679
+                      (subst-char-in-string ?% ?_)
+                      ;; arc-mode concatenates archive name and file name
+                      ;; with colon, which isn't allowed on MS-Windows.
+                      (subst-char-in-string ?: ?_))
+                    "-"
+                    (let ((file doc-view--buffer-file-name))
+                      (with-temp-buffer
+                        (set-buffer-multibyte nil)
+                        (insert-file-contents-literally file)
+                        (md5 (current-buffer)))))
             doc-view-cache-directory)))))
 
 ;;;###autoload
diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el
index f29f64f0562..6a4d835b63c 100644
--- a/lisp/emacs-lisp/easy-mmode.el
+++ b/lisp/emacs-lisp/easy-mmode.el
@@ -68,6 +68,7 @@ replacing its case-insensitive matches with the literal string in LIGHTER."
                                      "toggle-\\|-mode\\'" ""
                                      (symbol-name mode))))
                        " mode")))
+    (setq name (replace-regexp-in-string "\\`Global-" "Global " name))
     (if (not (stringp lighter)) name
       ;; Strip leading and trailing whitespace from LIGHTER.
       (setq lighter (replace-regexp-in-string "\\`\\s-+\\|\\s-+\\'" ""
diff --git a/lisp/gnus/ChangeLog.3 b/lisp/gnus/ChangeLog.3
index 5e7e95b0466..e6cbe0458b4 100644
--- a/lisp/gnus/ChangeLog.3
+++ b/lisp/gnus/ChangeLog.3
@@ -1732,7 +1732,7 @@
         * eww.el (eww-convert-widgets): Put `help-echo' on input fields so that
         we can navigate to them.
 
-        * shr.el (shr-colorize-region): Put the colours over the entire region.
+        * shr.el (shr-colorize-region): Put the colors over the entire region.
         (shr-inhibit-decoration): New variable.
         (shr-add-font): Use it to inhibit text property decorations while doing
         preliminary table renderings.  This speeds up typical Wikipedia page
@@ -1824,7 +1824,7 @@
         * shr.el (shr-expand-url): Respect // URLs.
 
         * eww.el (eww-tag-body): Override the shr body rendering so that we can
-        put a background colour onto the entire buffer.
+        put a background color onto the entire buffer.
         (eww-render): When being redirected, use the redirect URL as the new
         base URL.
 
@@ -3514,7 +3514,7 @@
 
         * mm-archive.el (mm-archive-decoders): Add support for tar.
 
-        * gnus.el (gnus-logo-color-alist): Change the colours for Ma Gnus.
+        * gnus.el (gnus-logo-color-alist): Change the colors for Ma Gnus.
 
         * nnmail.el (nnmail-extra-headers): Add Cc to the default.
 
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 39600cf28f8..8f2acf3cd61 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -6056,7 +6056,10 @@ comment at the start of cc-engine.el for more info."
                    ;; Stop on ',', '|', '&', '+' and '-' to catch
                    ;; common binary operators that could be between
                    ;; two comparison expressions "a<b" and "c>d".
-                   "[<;{},|+&-]\\|[>)]"
+                   ;; 2016-02-11: C++11 templates can now contain arithmetic
+                   ;; expressions, so template detection in C++ is now less
+                   ;; robust than it was.
+                   c-<>-notable-chars-re
                    nil t t))
 
                 (cond
@@ -6064,7 +6067,9 @@ comment at the start of cc-engine.el for more info."
                   ;; Either an operator starting with '>' or the end of
                   ;; the angle bracket arglist.
 
-                  (if (looking-at c->-op-without->-cont-regexp)
+                  (if (save-excursion
+                        (c-backward-token-2)
+                        (looking-at c-multichar->-op-not->>-regexp))
                       (progn
                         (goto-char (match-end 0))
                         t)              ; Continue the loop.
@@ -6134,6 +6139,11 @@ comment at the start of cc-engine.el for more info."
                       )))
                   t)                    ; carry on looping.
 
+                 ((and
+                   (eq (char-before) ?\()
+                   (c-go-up-list-forward)
+                   (eq (char-before) ?\))))
+
                  ((and (not c-restricted-<>-arglists)
                        (or (and (eq (char-before) ?&)
                                 (not (eq (char-after) ?&)))
diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el
index ef894043bce..86b6bec78a1 100644
--- a/lisp/progmodes/cc-langs.el
+++ b/lisp/progmodes/cc-langs.el
@@ -228,6 +228,12 @@ the evaluated constant value at compile time."
     ;; with the group symbol for each group and should return non-nil
     ;; if that group is to be included.
     ;;
+    ;; OP-FILTER selects the operators.  It is either t to select all
+    ;; operators, a string to select all operators for which `string-match'
+    ;; matches the operator with the string, or a function which will be
+    ;; called with the operator and should return non-nil when the operator
+    ;; is to be selected.
+    ;;
     ;; If XLATE is given, it's a function which is called for each
     ;; matching operator and its return value is collected instead.
     ;; If it returns a list, the elements are spliced directly into
@@ -1237,7 +1243,6 @@ operators."
                     t
                     "\\`<."
                     (lambda (op) (substring op 1)))))
-
 (c-lang-defvar c-<-op-cont-regexp (c-lang-const c-<-op-cont-regexp))
 
 (c-lang-defconst c->-op-cont-tokens
@@ -1256,7 +1261,6 @@ operators."
   ;; Regexp matching the second and subsequent characters of all
   ;; multicharacter tokens that begin with ">".
   t (c-make-keywords-re nil (c-lang-const c->-op-cont-tokens)))
-
 (c-lang-defvar c->-op-cont-regexp (c-lang-const c->-op-cont-regexp))
 
 (c-lang-defconst c->-op-without->-cont-regexp
@@ -1271,10 +1275,19 @@ operators."
                      "\\`>>"
                      (lambda (op) (substring op 1)))
        :test 'string-equal)))
-
 (c-lang-defvar c->-op-without->-cont-regexp
   (c-lang-const c->-op-without->-cont-regexp))
 
+(c-lang-defconst c-multichar->-op-not->>-regexp
+  ;; Regexp matching multichar tokens containing ">", except ">>"
+  t (c-make-keywords-re nil
+      (delete ">>"
+              (c-filter-ops (c-lang-const c-all-op-syntax-tokens)
+                            t
+                            "\\(.>\\|>.\\)"))))
+(c-lang-defvar c-multichar->-op-not->>-regexp
+  (c-lang-const c-multichar->-op-not->>-regexp))
+
 (c-lang-defconst c-stmt-delim-chars
   ;; The characters that should be considered to bound statements.  To
   ;; optimize `c-crosses-statement-barrier-p' somewhat, it's assumed to
@@ -3079,6 +3092,20 @@ expression is considered to be a type."
                     ; generics is not yet coded in CC Mode.
 (c-lang-defvar c-recognize-<>-arglists (c-lang-const c-recognize-<>-arglists))
 
+(c-lang-defconst c-<>-notable-chars-re
+  "A regexp matching any single character notable inside a <...> construct.
+This must include \"<\" and \">\", and should include \",\", and
+any character which cannot be valid inside such a construct.
+This is used in `c-forward-<>-arglist-recur' to try to detect
+sequences of tokens which cannot be a template/generic construct.
+When \"(\" is present, that defun will attempt to parse a
+parenthesized expression inside the template.  When \")\" is
+present it will treat an unbalanced closing paren as a sign of
+the invalidity of the putative template construct."
+  t "[<;{},|+&->)]"
+  c++ "[<;{},>()]")
+(c-lang-defvar c-<>-notable-chars-re (c-lang-const c-<>-notable-chars-re))
+
 (c-lang-defconst c-enums-contain-decls
   "Non-nil means that an enum structure can contain declarations."
   t nil
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index 7e6f157f5fe..f04a7226d18 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -189,7 +189,7 @@ Customize or call the function `grep-apply-setting'."
   :group 'grep)
 
 (defcustom grep-files-aliases
-  '(("all" .   "* .*")
+  '(("all" .   "* .[!.]* ..?*") ;; Don't match `..'. See bug#22577
     ("el" .    "*.el")
     ("ch" .    "*.[ch]")
     ("c" .     "*.c")