aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim F. Storm2005-05-01 22:33:57 +0000
committerKim F. Storm2005-05-01 22:33:57 +0000
commit1934f5299945dd37028d72c8e07f8d67e0237cb1 (patch)
tree3ce4bc89994b3fcb10fba12bc8273c290cc6c741
parent5c2e5a5e28e0513453555a0083dfd849cd1bdc69 (diff)
downloademacs-1934f5299945dd37028d72c8e07f8d67e0237cb1.tar.gz
emacs-1934f5299945dd37028d72c8e07f8d67e0237cb1.zip
Fix check for CUA-mode if no init file.
-rw-r--r--lisp/emulation/cua-base.el6
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el
index 6aeb4bab5a2..6eb19b7377e 100644
--- a/lisp/emulation/cua-base.el
+++ b/lisp/emulation/cua-base.el
@@ -1397,10 +1397,12 @@ paste (in addition to the normal emacs bindings)."
1397;;;###autoload '(error (concat "\n\n" 1397;;;###autoload '(error (concat "\n\n"
1398;;;###autoload "CUA-mode is now part of the standard GNU Emacs distribution,\n" 1398;;;###autoload "CUA-mode is now part of the standard GNU Emacs distribution,\n"
1399;;;###autoload "so you may now enable and customize CUA via the Options menu.\n\n" 1399;;;###autoload "so you may now enable and customize CUA via the Options menu.\n\n"
1400;;;###autoload "Your " (file-name-nondirectory user-init-file) " loads an older version of CUA-mode which does\n" 1400;;;###autoload (if user-init-file (concat
1401;;;###autoload "Your " (file-name-nondirectory user-init-file)
1402;;;###autoload " loads an older version of CUA-mode which does\n"
1401;;;###autoload "not work correctly with this version of GNU Emacs.\n" 1403;;;###autoload "not work correctly with this version of GNU Emacs.\n"
1402;;;###autoload "To correct this, remove the loading and customization of the\n" 1404;;;###autoload "To correct this, remove the loading and customization of the\n"
1403;;;###autoload "old version from the " user-init-file " file.\n\n"))) 1405;;;###autoload "old version from the " user-init-file " file.\n\n") ""))))
1404 1406
1405(provide 'cua) 1407(provide 'cua)
1406 1408