Merge from emacs--rel--22

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1112

2 files changed, 6 insertions, 5 deletions

diff --git a/lisp/dired.el b/lisp/dired.el
index faa048373e7..375894ca8c1 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -3250,7 +3250,7 @@ Anything else means ask for each directory."
 
 (defun dired-dnd-popup-notice ()
   (message-box
-   "Recursive copies not enabled.\nSee variable dired-recursive-copies."))
+   "Dired recursive copies are currently disabled.\nSee the variable `dired-recursive-copies'."))
 
 
 (defun dired-dnd-do-ask-action (uri)
diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el
index ed3efc66ec2..f22b75218da 100644
--- a/lisp/progmodes/cc-langs.el
+++ b/lisp/progmodes/cc-langs.el
@@ -728,13 +728,14 @@ definition, or nil if the language doesn't have any."
         "define"))
 
 (c-lang-defconst c-opt-cpp-macro-define-start
-  ;; Regexp matching everything up to the macro body of a cpp define,
-  ;; or the end of the logical line if there is none.  Set if
-  ;; c-opt-cpp-macro-define is.
+  ;; Regexp matching everything up to the macro body of a cpp define, or the
+  ;; end of the logical line if there is none.  Submatch 1 is the name of the
+  ;; macro.  Set if c-opt-cpp-macro-define is.
   t (if (c-lang-const c-opt-cpp-macro-define)
         (concat (c-lang-const c-opt-cpp-prefix)
                 (c-lang-const c-opt-cpp-macro-define)
-                "[ \t]+\\(\\sw\\|_\\)+\\(\([^\)]*\)\\)?"
+                "[ \t]+\\(\\(\\sw\\|_\\)+\\)\\(\([^\)]*\)\\)?"
+                ;;       ^                 ^ #defined name
                 "\\([ \t]\\|\\\\\n\\)*")))
 (c-lang-defvar c-opt-cpp-macro-define-start
   (c-lang-const c-opt-cpp-macro-define-start))