diff options
| author | Miles Bader | 2006-06-07 18:05:10 +0000 |
|---|---|---|
| committer | Miles Bader | 2006-06-07 18:05:10 +0000 |
| commit | b883cdb2fefa8ea9c3b0d82eba7a9ee792f871bb (patch) | |
| tree | de3804210a8cd955e0d3b9abc15679480930bc82 /lisp/emulation | |
| parent | 885b7d0991bd4b4b8f4bd1d3cd21c18a697bbce2 (diff) | |
| parent | 26c9afc3239e18b03537faaea33e3e82e28099e6 (diff) | |
| download | emacs-b883cdb2fefa8ea9c3b0d82eba7a9ee792f871bb.tar.gz emacs-b883cdb2fefa8ea9c3b0d82eba7a9ee792f871bb.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 285-296)
- Update from CVS
- Merge from gnus--rel--5.10
- Update from CVS: admin/FOR-RELEASE: Update refcard section.
* gnus--rel--5.10 (patch 102-104)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-64
Diffstat (limited to 'lisp/emulation')
| -rw-r--r-- | lisp/emulation/cua-base.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el index 2d169e889cd..7a11d6318a9 100644 --- a/lisp/emulation/cua-base.el +++ b/lisp/emulation/cua-base.el | |||
| @@ -1498,8 +1498,8 @@ shifted movement key, set `cua-highlight-region-shift-only'." | |||
| 1498 | 1498 | ||
| 1499 | ;;;###autoload (eval-after-load 'CUA-mode | 1499 | ;;;###autoload (eval-after-load 'CUA-mode |
| 1500 | ;;;###autoload '(error (concat "\n\n" | 1500 | ;;;###autoload '(error (concat "\n\n" |
| 1501 | ;;;###autoload "CUA-mode is now part of the standard GNU Emacs distribution,\n" | 1501 | ;;;###autoload "CUA-mode is now part of the standard GNU Emacs distribution, so you may\n" |
| 1502 | ;;;###autoload "so you may now enable and customize CUA via the Options menu.\n\n" | 1502 | ;;;###autoload "now enable CUA via the Options menu or by customizing option `cua-mode'.\n\n" |
| 1503 | ;;;###autoload "You have loaded an older version of CUA-mode which does\n" | 1503 | ;;;###autoload "You have loaded an older version of CUA-mode which does\n" |
| 1504 | ;;;###autoload "not work correctly with this version of GNU Emacs.\n\n" | 1504 | ;;;###autoload "not work correctly with this version of GNU Emacs.\n\n" |
| 1505 | ;;;###autoload (if user-init-file (concat | 1505 | ;;;###autoload (if user-init-file (concat |