Merge from origin/emacs-25

2c117fc * etc/NEWS: Document new mpc.el features
71a0496 * lisp/custom.el (defface): Revert indentation change.  (Bug#22524)
9dfece1 Correctly fontify C++ initializations which "look like" functions.
4485222 Improve newsticker-treeview-selection-face
4236944 Minor fix in tagging Ruby accessors by etags
35fc77d Spelling fixes
3dda110 Remove 'def X' from the example

5 files changed, 42 insertions, 13 deletions

diff --git a/lisp/custom.el b/lisp/custom.el
index 550ba440c0f..f4045008ebf 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -411,8 +411,7 @@ In the ATTS property list, possible attributes are `:family',
 
 See Info node `(elisp) Faces' in the Emacs Lisp manual for more
 information."
-  (declare (doc-string 3)
-           (indent 1))
+  (declare (doc-string 3))
   ;; It is better not to use backquote in this file,
   ;; because that makes a bootstrapping problem
   ;; if you need to recompile all the Lisp files using interpreted code.
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 98ea594e164..d52a83b1029 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -3997,7 +3997,7 @@ Prompt for one if called interactively."
                        (format "MODE %s -k" tgt)))))
 
 (defun erc-completion-at-point ()
-  "Perform complection on the text around point case-insentitively.
+  "Perform completion on the text around point case-insensitively.
 See `completion-at-point'."
   (interactive)
   (let ((completion-ignore-case t))
diff --git a/lisp/net/newst-treeview.el b/lisp/net/newst-treeview.el
index 4de3d1d1125..c995af58c27 100644
--- a/lisp/net/newst-treeview.el
+++ b/lisp/net/newst-treeview.el
@@ -77,7 +77,7 @@
   :group 'newsticker-treeview)
 
 (defface newsticker-treeview-selection-face
-  '((((class color) (background dark))  :background "#bbbbff")
+  '((((class color) (background dark))  :background "#4444aa")
     (((class color) (background light)) :background "#bbbbff"))
   "Face for newsticker selection."
   :group 'newsticker-treeview)
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index dc2480961d1..39600cf28f8 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -6802,7 +6802,7 @@ comment at the start of cc-engine.el for more info."
         ;; This identifier is bound only in the inner let.
         '(setq start id-start))))
 
-(defun c-forward-declarator (&optional limit)
+(defun c-forward-declarator (&optional limit accept-anon)
   ;; Assuming point is at the start of a declarator, move forward over it,
   ;; leaving point at the next token after it (e.g. a ) or a ; or a ,).
   ;;
@@ -6811,6 +6811,11 @@ comment at the start of cc-engine.el for more info."
   ;; BRACKETS-AFTER-ID is non-nil if a [...] pair is present after the id.
   ;; GOT-INIT is non-nil when the declarator is followed by "=" or "(".
   ;;
+  ;; If ACCEPT-ANON is non-nil, move forward over any "anonymous declarator",
+  ;; i.e. something like the (*) in int (*), such as might be found in a
+  ;; declaration.  In such a case ID-START and ID-END in the return value are
+  ;; both set to nil.  A "null" "anonymous declarator" gives a non-nil result.
+  ;;
   ;; If no declarator is found, leave point unmoved and return nil.  LIMIT is
   ;; an optional limit for forward searching.
   ;;
@@ -6865,13 +6870,17 @@ comment at the start of cc-engine.el for more info."
 
            ;; If we haven't passed the identifier already, do it now.
            (unless got-identifier
-             (setq id-start (point))
-             (c-forward-name))
-           (prog1
-               (/= (point) here)
+             (setq id-start (point)))
+           (cond
+            ((or got-identifier
+                 (c-forward-name))
              (save-excursion
                (c-backward-syntactic-ws)
-               (setq id-end (point)))))
+               (setq id-end (point))))
+            (accept-anon
+             (setq id-start nil id-end nil)
+             t)
+            (t (/= (point) here))))
 
          ;; Skip out of the parens surrounding the identifier.  If closing
          ;; parens are missing, this form returns nil.
@@ -7260,7 +7269,7 @@ comment at the start of cc-engine.el for more info."
       (goto-char id-start)
 
       ;; Skip over type decl prefix operators.  (Note similar code in
-      ;; `c-font-lock-declarators'.)
+      ;; `c-forward-declarator'.)
       (if (and c-recognize-typeless-decls
                (equal c-type-decl-prefix-key "\\<\\>"))
           (when (eq (char-after) ?\()
diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el
index 1e101d12aac..3cc537bba3d 100644
--- a/lisp/progmodes/cc-fonts.el
+++ b/lisp/progmodes/cc-fonts.el
@@ -1008,7 +1008,7 @@ casts and declarations are fontified.  Used on level 2 and higher."
       ((pos (point)) next-pos id-start id-end
        decl-res
        paren-depth
-       id-face got-init
+       id-face got-type got-init
        c-last-identifier-range
        (separator-prop (if types 'c-decl-type-start 'c-decl-id-start))
        brackets-after-id)
@@ -1020,7 +1020,28 @@ casts and declarations are fontified.  Used on level 2 and higher."
       (setq next-pos (point)
             id-start (car decl-res)
             id-face (if (and (eq (char-after) ?\()
-                             (not (car (cddr decl-res)))) ; brackets-after-id
+                             (not (car (cddr decl-res))) ; brackets-after-id
+                             (or (not (c-major-mode-is 'c++-mode))
+                                 (save-excursion
+                                   (let (c-last-identifier-range)
+                                     (forward-char)
+                                     (c-forward-syntactic-ws)
+                                     (catch 'is-function
+                                       (while
+                                           (progn
+                                             (if (eq (char-after) ?\))
+                                                 (throw 'is-function t))
+                                             (setq got-type (c-forward-type))
+                                             (cond
+                                              ((null got-type)
+                                               (throw 'is-function nil))
+                                              ((not (eq got-type 'maybe))
+                                               (throw 'is-function t)))
+                                             (c-forward-declarator limit t)
+                                             (eq (char-after) ?,))
+                                         (forward-char)
+                                         (c-forward-syntactic-ws))
+                                       t)))))
                         'font-lock-function-name-face
                       'font-lock-variable-name-face)
             got-init (and (cadr (cddr decl-res)) ; got-init