diff options
| author | Karoly Lorentey | 2004-11-06 17:52:02 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2004-11-06 17:52:02 +0000 |
| commit | 65ea79492334e2ef7b5b4e0d23b6f68ba2f4d0bb (patch) | |
| tree | 853cf391ca1abda4f4ccd6fe8e7bb43f7c86ee08 /lisp/emulation | |
| parent | e0bc17abe6979d607e8de4684dddb96e53c60065 (diff) | |
| parent | 392cf16dd0ee9358f8af0cd0d8048b822456bbeb (diff) | |
| download | emacs-65ea79492334e2ef7b5b4e0d23b6f68ba2f4d0bb.tar.gz emacs-65ea79492334e2ef7b5b4e0d23b6f68ba2f4d0bb.zip | |
Merged in changes from CVS trunk.
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-653
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-654
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-655
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-656
Update from CVS: lisp/man.el (Man-xref-normal-file): Fix help-echo.
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-657
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-658
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-659
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-660
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-661
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-662
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-663
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-664
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-665
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-666
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-667
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-668
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-669
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-670
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-671
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-64
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-65
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-66
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-67
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-68
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-264
Diffstat (limited to 'lisp/emulation')
| -rw-r--r-- | lisp/emulation/cua-base.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el index 00411c8ca4c..523a07d26de 100644 --- a/lisp/emulation/cua-base.el +++ b/lisp/emulation/cua-base.el | |||
| @@ -267,6 +267,7 @@ | |||
| 267 | :group 'editing-basics | 267 | :group 'editing-basics |
| 268 | :group 'convenience | 268 | :group 'convenience |
| 269 | :group 'emulations | 269 | :group 'emulations |
| 270 | :version "21.4" | ||
| 270 | :link '(emacs-commentary-link :tag "Commentary" "cua-base.el") | 271 | :link '(emacs-commentary-link :tag "Commentary" "cua-base.el") |
| 271 | :link '(emacs-library-link :tag "Lisp File" "cua-base.el")) | 272 | :link '(emacs-library-link :tag "Lisp File" "cua-base.el")) |
| 272 | 273 | ||
| @@ -1338,7 +1339,6 @@ paste (in addition to the normal emacs bindings)." | |||
| 1338 | :set-after '(cua-enable-modeline-indications cua-use-hyper-key) | 1339 | :set-after '(cua-enable-modeline-indications cua-use-hyper-key) |
| 1339 | :require 'cua-base | 1340 | :require 'cua-base |
| 1340 | :link '(emacs-commentary-link "cua-base.el") | 1341 | :link '(emacs-commentary-link "cua-base.el") |
| 1341 | :version "21.4" | ||
| 1342 | (setq mark-even-if-inactive t) | 1342 | (setq mark-even-if-inactive t) |
| 1343 | (setq highlight-nonselected-windows nil) | 1343 | (setq highlight-nonselected-windows nil) |
| 1344 | (make-variable-buffer-local 'cua--explicit-region-start) | 1344 | (make-variable-buffer-local 'cua--explicit-region-start) |