aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarl Heuer1995-11-10 18:58:59 +0000
committerKarl Heuer1995-11-10 18:58:59 +0000
commit2ff24a23f49847e81b4ffce52dade7b5a2a75072 (patch)
tree3189844b8e0c095ca3b7df5295da96972520fcac
parentf36e4a5ea9e9281d67a4d3e08bf157cdec47d857 (diff)
downloademacs-2ff24a23f49847e81b4ffce52dade7b5a2a75072.tar.gz
emacs-2ff24a23f49847e81b4ffce52dade7b5a2a75072.zip
All faces added to facemenu-unlisted-faces list.
-rw-r--r--lisp/ediff-init.el16
1 files changed, 16 insertions, 0 deletions
diff --git a/lisp/ediff-init.el b/lisp/ediff-init.el
index 3be041ddbc2..41900194b6a 100644
--- a/lisp/ediff-init.el
+++ b/lisp/ediff-init.el
@@ -812,6 +812,7 @@ you are such a person.")
812 (copy-face 'secondary-selection face)))) 812 (copy-face 'secondary-selection face))))
813 )) 813 ))
814 814
815(add-to-list 'facemenu-unlisted-faces 'ediff-current-diff-face-A)
815(defvar ediff-current-diff-face-A 816(defvar ediff-current-diff-face-A
816 (if (ediff-window-display-p) 817 (if (ediff-window-display-p)
817 (progn 818 (progn
@@ -830,6 +831,7 @@ you are such a person.")
830 'ediff-current-diff-face-A)) 831 'ediff-current-diff-face-A))
831 "Face for highlighting the selected difference in buffer A.") 832 "Face for highlighting the selected difference in buffer A.")
832 833
834(add-to-list 'facemenu-unlisted-faces 'ediff-current-diff-face-B)
833(defvar ediff-current-diff-face-B 835(defvar ediff-current-diff-face-B
834 (if (ediff-window-display-p) 836 (if (ediff-window-display-p)
835 (progn 837 (progn
@@ -849,6 +851,7 @@ you are such a person.")
849 "Face for highlighting the selected difference in buffer B.") 851 "Face for highlighting the selected difference in buffer B.")
850 852
851 853
854(add-to-list 'facemenu-unlisted-faces 'ediff-current-diff-face-C)
852(defvar ediff-current-diff-face-C 855(defvar ediff-current-diff-face-C
853 (if (ediff-window-display-p) 856 (if (ediff-window-display-p)
854 (progn 857 (progn
@@ -867,6 +870,7 @@ you are such a person.")
867 'ediff-current-diff-face-C)) 870 'ediff-current-diff-face-C))
868 "Face for highlighting the selected difference in buffer C.") 871 "Face for highlighting the selected difference in buffer C.")
869 872
873(add-to-list 'facemenu-unlisted-faces 'ediff-current-diff-face-Ancestor)
870(defvar ediff-current-diff-face-Ancestor 874(defvar ediff-current-diff-face-Ancestor
871 (if (ediff-window-display-p) 875 (if (ediff-window-display-p)
872 (progn 876 (progn
@@ -876,6 +880,7 @@ you are such a person.")
876 'ediff-current-diff-face-C 'ediff-current-diff-face-Ancestor)))) 880 'ediff-current-diff-face-C 'ediff-current-diff-face-Ancestor))))
877 "Face for highlighting the selected difference in the ancestor buffer.") 881 "Face for highlighting the selected difference in the ancestor buffer.")
878 882
883(add-to-list 'facemenu-unlisted-faces 'ediff-fine-diff-face-A)
879(defvar ediff-fine-diff-face-A 884(defvar ediff-fine-diff-face-A
880 (if (ediff-window-display-p) 885 (if (ediff-window-display-p)
881 (progn 886 (progn
@@ -890,6 +895,7 @@ you are such a person.")
890 'ediff-fine-diff-face-A)) 895 'ediff-fine-diff-face-A))
891 "Face for highlighting the refinement of the selected diff in buffer A.") 896 "Face for highlighting the refinement of the selected diff in buffer A.")
892 897
898(add-to-list 'facemenu-unlisted-faces 'ediff-fine-diff-face-B)
893(defvar ediff-fine-diff-face-B 899(defvar ediff-fine-diff-face-B
894 (if (ediff-window-display-p) 900 (if (ediff-window-display-p)
895 (progn 901 (progn
@@ -902,6 +908,7 @@ you are such a person.")
902 'ediff-fine-diff-face-B)) 908 'ediff-fine-diff-face-B))
903 "Face for highlighting the refinement of the selected diff in buffer B.") 909 "Face for highlighting the refinement of the selected diff in buffer B.")
904 910
911(add-to-list 'facemenu-unlisted-faces 'ediff-fine-diff-face-C)
905(defvar ediff-fine-diff-face-C 912(defvar ediff-fine-diff-face-C
906 (if (ediff-window-display-p) 913 (if (ediff-window-display-p)
907 (progn 914 (progn
@@ -915,6 +922,7 @@ you are such a person.")
915 'ediff-fine-diff-face-C)) 922 'ediff-fine-diff-face-C))
916 "Face for highlighting the refinement of the selected diff in buffer C.") 923 "Face for highlighting the refinement of the selected diff in buffer C.")
917 924
925(add-to-list 'facemenu-unlisted-faces 'ediff-fine-diff-face-Ancestor)
918(defvar ediff-fine-diff-face-Ancestor 926(defvar ediff-fine-diff-face-Ancestor
919 (if (ediff-window-display-p) 927 (if (ediff-window-display-p)
920 (progn 928 (progn
@@ -926,6 +934,7 @@ you are such a person.")
926Presently, this is not used, as difference regions are not refined in the 934Presently, this is not used, as difference regions are not refined in the
927ancestor buffer.") 935ancestor buffer.")
928 936
937(add-to-list 'facemenu-unlisted-faces 'ediff-even-diff-face-A)
929(defvar ediff-even-diff-face-A 938(defvar ediff-even-diff-face-A
930 (if (ediff-window-display-p) 939 (if (ediff-window-display-p)
931 (progn 940 (progn
@@ -941,6 +950,7 @@ ancestor buffer.")
941 'ediff-even-diff-face-A)) 950 'ediff-even-diff-face-A))
942 "Face used to highlight even-numbered differences in buffer A.") 951 "Face used to highlight even-numbered differences in buffer A.")
943 952
953(add-to-list 'facemenu-unlisted-faces 'ediff-even-diff-face-B)
944(defvar ediff-even-diff-face-B 954(defvar ediff-even-diff-face-B
945 (if (ediff-window-display-p) 955 (if (ediff-window-display-p)
946 (progn 956 (progn
@@ -956,6 +966,7 @@ ancestor buffer.")
956 'ediff-even-diff-face-B)) 966 'ediff-even-diff-face-B))
957 "Face used to highlight even-numbered differences in buffer B.") 967 "Face used to highlight even-numbered differences in buffer B.")
958 968
969(add-to-list 'facemenu-unlisted-faces 'ediff-even-diff-face-C)
959(defvar ediff-even-diff-face-C 970(defvar ediff-even-diff-face-C
960 (if (ediff-window-display-p) 971 (if (ediff-window-display-p)
961 (progn 972 (progn
@@ -965,6 +976,7 @@ ancestor buffer.")
965 'ediff-even-diff-face-C)) 976 'ediff-even-diff-face-C))
966 "Face used to highlight even-numbered differences in buffer C.") 977 "Face used to highlight even-numbered differences in buffer C.")
967 978
979(add-to-list 'facemenu-unlisted-faces 'ediff-even-diff-face-Ancestor)
968(defvar ediff-even-diff-face-Ancestor 980(defvar ediff-even-diff-face-Ancestor
969 (if (ediff-window-display-p) 981 (if (ediff-window-display-p)
970 (progn 982 (progn
@@ -974,6 +986,7 @@ ancestor buffer.")
974 'ediff-even-diff-face-Ancestor)) 986 'ediff-even-diff-face-Ancestor))
975 "Face highlighting even-numbered differences in the ancestor buffer.") 987 "Face highlighting even-numbered differences in the ancestor buffer.")
976 988
989(add-to-list 'facemenu-unlisted-faces 'ediff-odd-diff-face-A)
977(defvar ediff-odd-diff-face-A 990(defvar ediff-odd-diff-face-A
978 (if (ediff-window-display-p) 991 (if (ediff-window-display-p)
979 (progn 992 (progn
@@ -989,6 +1002,7 @@ ancestor buffer.")
989 'ediff-odd-diff-face-A)) 1002 'ediff-odd-diff-face-A))
990 "Face used to highlight odd-numbered differences in buffer A.") 1003 "Face used to highlight odd-numbered differences in buffer A.")
991 1004
1005(add-to-list 'facemenu-unlisted-faces 'ediff-odd-diff-face-B)
992(defvar ediff-odd-diff-face-B 1006(defvar ediff-odd-diff-face-B
993 (if (ediff-window-display-p) 1007 (if (ediff-window-display-p)
994 (progn 1008 (progn
@@ -1004,6 +1018,7 @@ ancestor buffer.")
1004 'ediff-odd-diff-face-B)) 1018 'ediff-odd-diff-face-B))
1005 "Face used to highlight odd-numbered differences in buffer B.") 1019 "Face used to highlight odd-numbered differences in buffer B.")
1006 1020
1021(add-to-list 'facemenu-unlisted-faces 'ediff-odd-diff-face-C)
1007(defvar ediff-odd-diff-face-C 1022(defvar ediff-odd-diff-face-C
1008 (if (ediff-window-display-p) 1023 (if (ediff-window-display-p)
1009 (progn 1024 (progn
@@ -1013,6 +1028,7 @@ ancestor buffer.")
1013 'ediff-odd-diff-face-C)) 1028 'ediff-odd-diff-face-C))
1014 "Face used to highlight odd-numbered differences in buffer C.") 1029 "Face used to highlight odd-numbered differences in buffer C.")
1015 1030
1031(add-to-list 'facemenu-unlisted-faces 'ediff-odd-diff-face-Ancestor )
1016(defvar ediff-odd-diff-face-Ancestor 1032(defvar ediff-odd-diff-face-Ancestor
1017 (if (ediff-window-display-p) 1033 (if (ediff-window-display-p)
1018 (progn 1034 (progn