[Emacs-diffs] Changes to emacs/lisp/emulation/cua-base.el

[Kim F . Storm]

Index: emacs/lisp/emulation/cua-base.el
diff -c emacs/lisp/emulation/cua-base.el:1.46 
emacs/lisp/emulation/cua-base.el:1.47
*** emacs/lisp/emulation/cua-base.el:1.46       Mon Apr 18 19:50:07 2005
--- emacs/lisp/emulation/cua-base.el    Sun May  1 22:33:57 2005
***************
*** 1397,1406 ****
  ;;;###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  "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")))
  
  (provide 'cua)
  
--- 1397,1408 ----
  ;;;###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  (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") ""))))
  
  (provide 'cua)