Rework last fix.

diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el
index 6eb19b7377e76d2ba9b7f86c9165a61ed026d418..2a515bc95f7e2390b2912dcbb8c7f46ccab4f184 100644 (file)
--- a/lisp/emulation/cua-base.el
+++ b/lisp/emulation/cua-base.el
@@ -1397,12 +1397,11 @@ paste (in addition to the normal emacs bindings)."
 ;;;###autoload  '(error (concat "\n\n"
 ;;;###autoload  "CUA-mode is now part of the standard GNU Emacs distribution,\n"
 ;;;###autoload  "so you may now enable and customize CUA via the Options menu.\n\n"
+;;;###autoload  "You have loaded an older version of CUA-mode which does\n"
+;;;###autoload  "not work correctly with this version of GNU Emacs.\n\n"
 ;;;###autoload  (if user-init-file (concat
-;;;###autoload  "Your " (file-name-nondirectory user-init-file)
-;;;###autoload  " loads an older version of CUA-mode which does\n"
-;;;###autoload  "not work correctly with this version of GNU Emacs.\n"
 ;;;###autoload  "To correct this, remove the loading and customization of the\n"
-;;;###autoload  "old version from the " user-init-file " file.\n\n") ""))))
+;;;###autoload  "old version from the " user-init-file " file.\n\n")))))
 
 (provide 'cua)