(c-electric-paren): clean-up space-before-funcall: only insert space when on

identifier, etc.  Patch by David Hansen.
----------------------------------------------------------------------

diff --git a/lisp/progmodes/cc-cmds.el b/lisp/progmodes/cc-cmds.el
index e142dcb06da8c3da76107793d447cc337a65986b..debdfe44cb4c039452285769716cf7a50a181738 100644 (file)
--- a/lisp/progmodes/cc-cmds.el
+++ b/lisp/progmodes/cc-cmds.el
@@ -1262,11 +1262,11 @@ newline cleanups are done if appropriate; see the variable `c-cleanup-list'."
                     (backward-char)
                     (skip-chars-backward " \t")
                     (setq beg (point))
-                    (c-save-buffer-state () (c-on-identifier))
-                    ;; Don't add a space into #define FOO()....
-                    (not (and (c-beginning-of-macro)
-                              (c-forward-over-cpp-define-id)
-                              (eq (point) beg)))))
+                    (and (c-save-buffer-state () (c-on-identifier))
+                          ;; Don't add a space into #define FOO()....
+                          (not (and (c-beginning-of-macro)
+                                    (c-forward-over-cpp-define-id)
+                                    (eq (point) beg))))))
              (save-excursion
                (delete-region beg end)
                (goto-char beg)