diff options
| author | Glenn Morris | 2007-08-14 08:41:06 +0000 |
|---|---|---|
| committer | Glenn Morris | 2007-08-14 08:41:06 +0000 |
| commit | 05d61686c6b5430884fb2c92dd762df6044eb3d2 (patch) | |
| tree | cc9cf62d3cb61fc9d0b2c1ef7b561b936c7c6299 | |
| parent | 697a1e4ddbc2b5e124048ce95f0aac69fe952539 (diff) | |
| download | emacs-05d61686c6b5430884fb2c92dd762df6044eb3d2.tar.gz emacs-05d61686c6b5430884fb2c92dd762df6044eb3d2.zip | |
Move CUA-mode check to `bad-packages-alist'.
| -rw-r--r-- | lisp/emulation/cua-base.el | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el index d0ec55781e7..6e420b36242 100644 --- a/lisp/emulation/cua-base.el +++ b/lisp/emulation/cua-base.el | |||
| @@ -1601,22 +1601,6 @@ shifted movement key, set `cua-highlight-region-shift-only'." | |||
| 1601 | (interactive) | 1601 | (interactive) |
| 1602 | (setq cua--debug (not cua--debug))) | 1602 | (setq cua--debug (not cua--debug))) |
| 1603 | 1603 | ||
| 1604 | ;; Install run-time check for older versions of CUA-mode which does not | ||
| 1605 | ;; work with GNU Emacs version 22.1 and newer. | ||
| 1606 | ;; | ||
| 1607 | ;; Except for version 1.2, all of the 1.x and 2.x version of cua-mode | ||
| 1608 | ;; provided the `CUA-mode' feature. Since this is no longer true, | ||
| 1609 | ;; we can warn the user if the `CUA-mode' feature is ever provided. | ||
| 1610 | |||
| 1611 | ;;;###autoload (eval-after-load 'CUA-mode | ||
| 1612 | ;;;###autoload '(error (concat "\n\n" | ||
| 1613 | ;;;###autoload "CUA-mode is now part of the standard GNU Emacs distribution, so you may\n" | ||
| 1614 | ;;;###autoload "now enable CUA via the Options menu or by customizing option `cua-mode'.\n\n" | ||
| 1615 | ;;;###autoload "You have loaded an older version of CUA-mode which does\n" | ||
| 1616 | ;;;###autoload "not work correctly with this version of GNU Emacs.\n\n" | ||
| 1617 | ;;;###autoload (if user-init-file (concat | ||
| 1618 | ;;;###autoload "To correct this, remove the loading and customization of the\n" | ||
| 1619 | ;;;###autoload "old version from the " user-init-file " file.\n\n"))))) | ||
| 1620 | 1604 | ||
| 1621 | (provide 'cua) | 1605 | (provide 'cua) |
| 1622 | 1606 | ||