diff options
| author | Miles Bader | 2005-10-15 00:26:05 +0000 |
|---|---|---|
| committer | Miles Bader | 2005-10-15 00:26:05 +0000 |
| commit | 9fe76e1b256aefe892edf84beb1fdfaf5ab0efa1 (patch) | |
| tree | 4570b6861b88c36c99783d4103d49c8658027834 /lisp/emulation | |
| parent | 2f0837ccf0ba386b9a9aab0eac2bad3076491a93 (diff) | |
| parent | d3a597b7b41c2ebdb457e7c8bb037958138028f2 (diff) | |
| download | emacs-9fe76e1b256aefe892edf84beb1fdfaf5ab0efa1.tar.gz emacs-9fe76e1b256aefe892edf84beb1fdfaf5ab0efa1.zip | |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-91
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 581-597)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 133-141)
- Update from CVS
- Merge from emacs--cvs-trunk--0
- Update from CVS: texi/gnus.texi (RSS): Fix key description.
- Update from CVS: texi/gnus.texi (Document Server Internals): Addition.
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 dc335a2eb82..b9ed8166d68 100644 --- a/lisp/emulation/cua-base.el +++ b/lisp/emulation/cua-base.el | |||
| @@ -548,7 +548,7 @@ a cons (TYPE . COLOR), then both properties are affected." | |||
| 548 | 548 | ||
| 549 | ;;; Global Mark support is in cua-gmrk.el | 549 | ;;; Global Mark support is in cua-gmrk.el |
| 550 | 550 | ||
| 551 | (autoload 'cua-toggle-global-mark "cua-gmrk.el" nil t nil) | 551 | (autoload 'cua-toggle-global-mark "cua-gmrk" nil t nil) |
| 552 | 552 | ||
| 553 | ;; Stub definitions until cua-gmrk.el is loaded | 553 | ;; Stub definitions until cua-gmrk.el is loaded |
| 554 | 554 | ||