Mercurial > emacs
comparison lisp/emulation/cua-base.el @ 90195:a1b34dec1104
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-63
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 358-423)
- Update from CVS
- Remove "-face" suffix from widget faces
- Remove "-face" suffix from custom faces
- Remove "-face" suffix from change-log faces
- Remove "-face" suffix from compilation faces
- Remove "-face" suffix from diff-mode faces
- lisp/longlines.el (longlines-visible-face): Face removed
- Remove "-face" suffix from woman faces
- Remove "-face" suffix from whitespace-highlight face
- Remove "-face" suffix from ruler-mode faces
- Remove "-face" suffix from show-paren faces
- Remove "-face" suffix from log-view faces
- Remove "-face" suffix from smerge faces
- Remove "-face" suffix from show-tabs faces
- Remove "-face" suffix from highlight-changes faces
- Remove "-face" suffix from and downcase info faces
- Remove "-face" suffix from pcvs faces
- Update uses of renamed pcvs faces
- Tweak ChangeLog
- Remove "-face" suffix from strokes-char face
- Remove "-face" suffix from compare-windows face
- Remove "-face" suffix from calendar faces
- Remove "-face" suffix from diary-button face
- Remove "-face" suffix from testcover faces
- Remove "-face" suffix from viper faces
- Remove "-face" suffix from org faces
- Remove "-face" suffix from sgml-namespace face
- Remove "-face" suffix from table-cell face
- Remove "-face" suffix from tex-mode faces
- Remove "-face" suffix from texinfo-heading face
- Remove "-face" suffix from flyspell faces
- Remove "-face" suffix from gomoku faces
- Remove "-face" suffix from mpuz faces
- Merge from gnus--rel--5.10
- Remove "-face" suffix from Buffer-menu-buffer face
- Remove "-face" suffix from antlr-mode faces
- Remove "-face" suffix from ebrowse faces
- Remove "-face" suffix from flymake faces
- Remove "-face" suffix from idlwave faces
- Remove "-face" suffix from sh-script faces
- Remove "-face" suffix from vhdl-mode faces
- Remove "-face" suffix from which-func face
- Remove "-face" suffix from cperl-mode faces
- Remove "-face" suffix from ld-script faces
- Fix cperl-mode font-lock problem
- Tweak which-func face
* gnus--rel--5.10 (patch 80-82)
- Merge from emacs--cvs-trunk--0
- Update from CVS
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Wed, 15 Jun 2005 23:32:15 +0000 |
| parents | 173dee4e2611 cabaef9d110d |
| children | f9a65d7ebd29 |
comparison
equal
deleted
inserted
replaced
| 90194:d940db5a66b9 | 90195:a1b34dec1104 |
|---|---|
| 445 :type '(choice | 445 :type '(choice |
| 446 (color :tag "Color") | 446 (color :tag "Color") |
| 447 (choice :tag "Type" | 447 (choice :tag "Type" |
| 448 (const :tag "Filled box" box) | 448 (const :tag "Filled box" box) |
| 449 (const :tag "Vertical bar" bar) | 449 (const :tag "Vertical bar" bar) |
| 450 (const :tag "Horisontal bar" hbar) | 450 (const :tag "Horizontal bar" hbar) |
| 451 (const :tag "Hollow box" hollow)) | 451 (const :tag "Hollow box" hollow)) |
| 452 (cons :tag "Color and Type" | 452 (cons :tag "Color and Type" |
| 453 (choice :tag "Type" | 453 (choice :tag "Type" |
| 454 (const :tag "Filled box" box) | 454 (const :tag "Filled box" box) |
| 455 (const :tag "Vertical bar" bar) | 455 (const :tag "Vertical bar" bar) |
| 456 (const :tag "Horisontal bar" hbar) | 456 (const :tag "Horizontal bar" hbar) |
| 457 (const :tag "Hollow box" hollow)) | 457 (const :tag "Hollow box" hollow)) |
| 458 (color :tag "Color"))) | 458 (color :tag "Color"))) |
| 459 :group 'cua) | 459 :group 'cua) |
| 460 | 460 |
| 461 (defcustom cua-read-only-cursor-color "darkgreen" | 461 (defcustom cua-read-only-cursor-color "darkgreen" |
| 469 :type '(choice | 469 :type '(choice |
| 470 (color :tag "Color") | 470 (color :tag "Color") |
| 471 (choice :tag "Type" | 471 (choice :tag "Type" |
| 472 (const :tag "Filled box" box) | 472 (const :tag "Filled box" box) |
| 473 (const :tag "Vertical bar" bar) | 473 (const :tag "Vertical bar" bar) |
| 474 (const :tag "Horisontal bar" hbar) | 474 (const :tag "Horizontal bar" hbar) |
| 475 (const :tag "Hollow box" hollow)) | 475 (const :tag "Hollow box" hollow)) |
| 476 (cons :tag "Color and Type" | 476 (cons :tag "Color and Type" |
| 477 (choice :tag "Type" | 477 (choice :tag "Type" |
| 478 (const :tag "Filled box" box) | 478 (const :tag "Filled box" box) |
| 479 (const :tag "Vertical bar" bar) | 479 (const :tag "Vertical bar" bar) |
| 480 (const :tag "Horisontal bar" hbar) | 480 (const :tag "Horizontal bar" hbar) |
| 481 (const :tag "Hollow box" hollow)) | 481 (const :tag "Hollow box" hollow)) |
| 482 (color :tag "Color"))) | 482 (color :tag "Color"))) |
| 483 :group 'cua) | 483 :group 'cua) |
| 484 | 484 |
| 485 (defcustom cua-overwrite-cursor-color "yellow" | 485 (defcustom cua-overwrite-cursor-color "yellow" |
| 493 :type '(choice | 493 :type '(choice |
| 494 (color :tag "Color") | 494 (color :tag "Color") |
| 495 (choice :tag "Type" | 495 (choice :tag "Type" |
| 496 (const :tag "Filled box" box) | 496 (const :tag "Filled box" box) |
| 497 (const :tag "Vertical bar" bar) | 497 (const :tag "Vertical bar" bar) |
| 498 (const :tag "Horisontal bar" hbar) | 498 (const :tag "Horizontal bar" hbar) |
| 499 (const :tag "Hollow box" hollow)) | 499 (const :tag "Hollow box" hollow)) |
| 500 (cons :tag "Color and Type" | 500 (cons :tag "Color and Type" |
| 501 (choice :tag "Type" | 501 (choice :tag "Type" |
| 502 (const :tag "Filled box" box) | 502 (const :tag "Filled box" box) |
| 503 (const :tag "Vertical bar" bar) | 503 (const :tag "Vertical bar" bar) |
| 504 (const :tag "Horisontal bar" hbar) | 504 (const :tag "Horizontal bar" hbar) |
| 505 (const :tag "Hollow box" hollow)) | 505 (const :tag "Hollow box" hollow)) |
| 506 (color :tag "Color"))) | 506 (color :tag "Color"))) |
| 507 :group 'cua) | 507 :group 'cua) |
| 508 | 508 |
| 509 (defcustom cua-global-mark-cursor-color "cyan" | 509 (defcustom cua-global-mark-cursor-color "cyan" |
| 518 :type '(choice | 518 :type '(choice |
| 519 (color :tag "Color") | 519 (color :tag "Color") |
| 520 (choice :tag "Type" | 520 (choice :tag "Type" |
| 521 (const :tag "Filled box" box) | 521 (const :tag "Filled box" box) |
| 522 (const :tag "Vertical bar" bar) | 522 (const :tag "Vertical bar" bar) |
| 523 (const :tag "Horisontal bar" hbar) | 523 (const :tag "Horizontal bar" hbar) |
| 524 (const :tag "Hollow box" hollow)) | 524 (const :tag "Hollow box" hollow)) |
| 525 (cons :tag "Color and Type" | 525 (cons :tag "Color and Type" |
| 526 (choice :tag "Type" | 526 (choice :tag "Type" |
| 527 (const :tag "Filled box" box) | 527 (const :tag "Filled box" box) |
| 528 (const :tag "Vertical bar" bar) | 528 (const :tag "Vertical bar" bar) |
| 529 (const :tag "Horisontal bar" hbar) | 529 (const :tag "Horizontal bar" hbar) |
| 530 (const :tag "Hollow box" hollow)) | 530 (const :tag "Hollow box" hollow)) |
| 531 (color :tag "Color"))) | 531 (color :tag "Color"))) |
| 532 :group 'cua) | 532 :group 'cua) |
| 533 | 533 |
| 534 | 534 |
| 1358 (remove-hook 'pre-command-hook 'cua--pre-command-handler) | 1358 (remove-hook 'pre-command-hook 'cua--pre-command-handler) |
| 1359 (remove-hook 'post-command-hook 'cua--post-command-handler)) | 1359 (remove-hook 'post-command-hook 'cua--post-command-handler)) |
| 1360 | 1360 |
| 1361 (if (not cua-mode) | 1361 (if (not cua-mode) |
| 1362 (setq emulation-mode-map-alists (delq 'cua--keymap-alist emulation-mode-map-alists)) | 1362 (setq emulation-mode-map-alists (delq 'cua--keymap-alist emulation-mode-map-alists)) |
| 1363 (add-to-list 'emulation-mode-map-alists 'cua--keymap-alist) | 1363 (add-to-ordered-list 'emulation-mode-map-alists 'cua--keymap-alist 400) |
| 1364 (cua--select-keymaps)) | 1364 (cua--select-keymaps)) |
| 1365 | 1365 |
| 1366 (cond | 1366 (cond |
| 1367 (cua-mode | 1367 (cua-mode |
| 1368 (setq cua--saved-state | 1368 (setq cua--saved-state |