diff options
| author | Richard M. Stallman | 1993-05-15 21:17:55 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1993-05-15 21:17:55 +0000 |
| commit | 578d09a64200f322b9a8a8bd0c51ac4a290607df (patch) | |
| tree | 8c606202e4a099087b304d274d3a2109a172c351 | |
| parent | 369747519d1b6dce5acb50ec20d529a3ed0c96f7 (diff) | |
| download | emacs-578d09a64200f322b9a8a8bd0c51ac4a290607df.tar.gz emacs-578d09a64200f322b9a8a8bd0c51ac4a290607df.zip | |
Rename `primary-selection' to `region'.
| -rw-r--r-- | lisp/faces.el | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/faces.el b/lisp/faces.el index 405c6b4fe51..0c1e4180ad9 100644 --- a/lisp/faces.el +++ b/lisp/faces.el | |||
| @@ -610,10 +610,10 @@ If NOERROR is non-nil, return nil on failure." | |||
| 610 | (make-face 'bold) | 610 | (make-face 'bold) |
| 611 | (make-face 'italic) | 611 | (make-face 'italic) |
| 612 | (make-face 'bold-italic) | 612 | (make-face 'bold-italic) |
| 613 | (make-face 'primary-selection) | 613 | (make-face 'region) |
| 614 | (make-face 'secondary-selection) | 614 | (make-face 'secondary-selection) |
| 615 | 615 | ||
| 616 | (setq region-face (face-id 'primary-selection)) | 616 | (setq region-face (face-id 'region)) |
| 617 | 617 | ||
| 618 | ;; Set up the faces of all existing X Window frames. | 618 | ;; Set up the faces of all existing X Window frames. |
| 619 | (let ((frames (frame-list))) | 619 | (let ((frames (frame-list))) |
| @@ -682,10 +682,10 @@ If NOERROR is non-nil, return nil on failure." | |||
| 682 | ;;; (set-face-background-pixmap 'highlight "gray1" frame) | 682 | ;;; (set-face-background-pixmap 'highlight "gray1" frame) |
| 683 | (error (invert-face 'highlight frame)))) | 683 | (error (invert-face 'highlight frame)))) |
| 684 | 684 | ||
| 685 | (or (face-differs-from-default-p 'primary-selection frame) | 685 | (or (face-differs-from-default-p 'region frame) |
| 686 | (condition-case () | 686 | (condition-case () |
| 687 | (set-face-background 'primary-selection "gray" frame) | 687 | (set-face-background 'region "gray" frame) |
| 688 | (error (invert-face 'primary-selection frame)))) | 688 | (error (invert-face 'region frame)))) |
| 689 | 689 | ||
| 690 | (or (face-differs-from-default-p 'secondary-selection frame) | 690 | (or (face-differs-from-default-p 'secondary-selection frame) |
| 691 | (condition-case () | 691 | (condition-case () |