# HG changeset patch # User Kim F. Storm # Date 1114986837 0 # Node ID b8e64f81f45f2e26bae6be8879b60e9564b691a3 # Parent 6eaeb13eb0a9cf13ec75bdcf0ea66037aa46fdc4 Fix check for CUA-mode if no init file. diff -r 6eaeb13eb0a9 -r b8e64f81f45f lisp/emulation/cua-base.el --- a/lisp/emulation/cua-base.el Sun May 01 22:33:16 2005 +0000 +++ b/lisp/emulation/cua-base.el Sun May 01 22:33:57 2005 +0000 @@ -1397,10 +1397,12 @@ ;;;###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 "Your " (file-name-nondirectory user-init-file) " loads an older version of CUA-mode which does\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)