diff options
| author | Miles Bader | 2005-04-09 02:16:29 +0000 |
|---|---|---|
| committer | Miles Bader | 2005-04-09 02:16:29 +0000 |
| commit | 768d4533ce51d61ce065b28f63aae43c7be0d1cc (patch) | |
| tree | fb2d103d5c9354b3a15550b160bba0ff2e22c418 /lisp/emulation | |
| parent | 918bcc18650840562677f841aa0bcaa34a069be5 (diff) | |
| parent | 2a9e192d3815d2c34fdd41d52590027805bc9055 (diff) | |
| download | emacs-768d4533ce51d61ce065b28f63aae43c7be0d1cc.tar.gz emacs-768d4533ce51d61ce065b28f63aae43c7be0d1cc.zip | |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-35
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 228-240)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 53-58)
- Merge from emacs--cvs-trunk--0
- Update from CVS
- Collapse feature addition/removal within single ChangeLog entry
Diffstat (limited to 'lisp/emulation')
| -rw-r--r-- | lisp/emulation/cua-base.el | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el index 7b2ba5c6fb2..8852999db2d 100644 --- a/lisp/emulation/cua-base.el +++ b/lisp/emulation/cua-base.el | |||
| @@ -1307,6 +1307,7 @@ highlight the region using `transient-mark-mode'), and typed text replaces | |||
| 1307 | the active selection. C-z, C-x, C-c, and C-v will undo, cut, copy, and | 1307 | the active selection. C-z, C-x, C-c, and C-v will undo, cut, copy, and |
| 1308 | paste (in addition to the normal emacs bindings)." | 1308 | paste (in addition to the normal emacs bindings)." |
| 1309 | :global t | 1309 | :global t |
| 1310 | :group 'cua | ||
| 1310 | :set-after '(cua-enable-modeline-indications cua-use-hyper-key) | 1311 | :set-after '(cua-enable-modeline-indications cua-use-hyper-key) |
| 1311 | :require 'cua-base | 1312 | :require 'cua-base |
| 1312 | :link '(emacs-commentary-link "cua-base.el") | 1313 | :link '(emacs-commentary-link "cua-base.el") |