Merge from origin/emacs-25

b787d55 More format-time-string change fixups
13c8f29 make-xwidget unused arg cleanup
36e05f0 Remove unused arguments from make-xwidget
1042217 Document incompatible changes in 'format-time-string'
7228eb8 Improve documentation of byte-code objects
0020047 Adapt calls to 'format-time-string' to changes in Emacs 25
17b5152 Improve vc-diff with Git backend
c28f87a (js--continued-expression-p): Special-case unary plus and minus
2d02a5f ; * lisp/vc/vc-annotate.el (vc-annotate): Clarify commentary.
9151f16 Prevent C++ Mode wrongly fontifying some identifiers near tem...
b3b523c Avoid crashes due to insanely large columns in tabulated-list...
a3daa34 Teach M-x disassemble a default argument.
e30c3e9 Fix EOL decoding in vc-annotate with SVN back-end on MS-Windows
df441b3 Fix OS X specific settings in tramp-tests
2244331 Finish fixing a cacheing bug in CC Mode (see 2016-03-09)

# Conflicts:
#	lisp/net/tramp-sh.el
#	lisp/progmodes/cc-engine.el

diff --cc doc/lispref/display.texi
Simple merge

diff --cc etc/NEWS
Simple merge

diff --cc lisp/gnus/gmm-utils.el
Simple merge

diff --cc lisp/net/tramp.el
index 4edca5a5998cd5f4e37372c932bf5318379a81e1,19dced6c2f32a4a81a6e1119c89467f2306b9f7a..e101c42a494fd77140c846e821050b010ff3e474
--- 1/lisp/net/tramp.el
--- 2/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@@ -3739,11 -3935,10 +3739,31 @@@ This is used internally by `tramp-file-
  
  ;;;###tramp-autoload
  (defun tramp-get-local-gid (id-format)
 +  ;; `group-gid' has been introduced with Emacs 24.4.
    (if (and (fboundp 'group-gid) (equal id-format 'integer))
        (tramp-compat-funcall 'group-gid)
 -    (nth 3 (tramp-compat-file-attributes "~/" id-format))))
 +    (nth 3 (file-attributes "~/" id-format))))
 +
++(defun tramp-get-local-locale (&optional vec)
++  ;; We use key nil for local connection properties.
++  (with-tramp-connection-property nil "locale"
++    (let ((candidates '("en_US.utf8" "C.utf8" "en_US.UTF-8"))
++        locale)
++      (with-temp-buffer
++      (unless (or (memq system-type '(windows-nt))
++                    (not (zerop (tramp-call-process
++                                 nil "locale" nil t nil "-a"))))
++        (while candidates
++          (goto-char (point-min))
++          (if (string-match (format "^%s\r?$" (regexp-quote (car candidates)))
++                            (buffer-string))
++              (setq locale (car candidates)
++                    candidates nil)
++            (setq candidates (cdr candidates))))))
++      ;; Return value.
++      (when vec (tramp-message vec 7 "locale %s" (or locale "C")))
++      (or locale "C"))))
+ 
  (defun tramp-get-local-locale (&optional vec)
    ;; We use key nil for local connection properties.
    (with-tramp-connection-property nil "locale"

diff --cc lisp/progmodes/cc-defs.el
Simple merge

diff --cc lisp/progmodes/cc-engine.el
index e04929a7226976c6c25b18f876f34d4a2c519e49,62bc236706d8fc4de672866bd29f8744d6878ade..4aff0dc14e094dfa05715b2f18f0bee96527c4da
--- 1/lisp/progmodes/cc-engine.el
--- 2/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@@ -5836,15 -5810,13 +5839,16 @@@ comment at the start of cc-engine.el fo
                               `(c-forward-type)
                             `(c-forward-name)))
                nil
 -            (and (looking-at c-keywords-regexp)
 -                 (c-forward-keyword-clause 1))))
 +            (cond ((looking-at c-keywords-regexp)
 +                   (c-forward-keyword-clause 1))
 +                  ((and c-opt-cpp-prefix
 +                        (looking-at c-noise-macro-with-parens-name-re))
 +                   (c-forward-noise-clause)))))
-      (when (memq res '(t known found prefix))
-        ,(when (eq type 'ref)
-         `(when c-record-type-identifiers
-            (c-record-ref-id c-last-identifier-range)))
+      (when (memq res '(t known found prefix maybe))
+        (when c-record-type-identifiers
 -       ,(if (eq type 'type)
 -            `(c-record-type-id c-last-identifier-range)
 -          `(c-record-ref-id c-last-identifier-range)))
++        ,(if (eq type 'type)
++             `(c-record-type-id c-last-identifier-range)
++           `(c-record-ref-id c-last-identifier-range)))
         t)))
  
  (defmacro c-forward-id-comma-list (type update-safe-pos)

diff --cc lisp/progmodes/cc-fonts.el
Simple merge

diff --cc lisp/vc/vc-git.el
Simple merge

diff --cc src/xdisp.c
Simple merge

diff --cc test/manual/indent/js.js
Simple merge