• Home
  • History
  • Annotate
  • Raw
  • Download
  • only in /macosx-10.10/emacs-93/emacs/lisp/

Lines Matching +defs:has +defs:local +defs:background

77 (defun ediff-has-face-support-p ()
86 (defun ediff-has-toolbar-support-p ()
93 (defun ediff-has-gutter-support-p ()
101 (and (ediff-has-toolbar-support-p) ;Can it do it ?
105 ;; Defines SYMBOL as an advertised local variable.
106 ;; Performs a defvar, then executes `make-variable-buffer-local' on
107 ;; the variable. Also sets the `permanent-local' property,
108 ;; so that `kill-all-local-variables' (called by major-mode setting
111 ;; Plagiarised from `emerge-defvar-local' for XEmacs.
112 (defmacro ediff-defvar-local (var value doc)
115 (make-variable-buffer-local ',var)
116 (put ',var 'permanent-local t)))
120 ;; Variables that control each Ediff session---local to the control buffer.
124 (ediff-defvar-local ediff-buffer-A nil "")
126 (ediff-defvar-local ediff-buffer-B nil "")
128 (ediff-defvar-local ediff-buffer-C nil "")
130 (ediff-defvar-local ediff-ancestor-buffer nil "")
132 (ediff-defvar-local ediff-control-buffer nil "")
134 (ediff-defvar-local ediff-temp-indirect-buffer nil
192 ;; Tell if it has been previously determined that the region has
205 ;; A Difference Vector has the form:
207 ;; where each diff has the form:
281 (ediff-defvar-local ediff-3way-comparison-job nil "")
292 (ediff-defvar-local ediff-merge-job nil "")
303 (ediff-defvar-local ediff-merge-with-ancestor-job nil "")
307 (ediff-defvar-local ediff-3way-job nil "")
314 (ediff-defvar-local ediff-diff3-job nil "")
318 (ediff-defvar-local ediff-windows-job nil "")
322 (ediff-defvar-local ediff-word-mode-job nil "")
329 (ediff-defvar-local ediff-narrow-job nil "")
442 "*Hooks to run in the control buffer after Ediff has been set up and is ready for the job."
446 "*Hooks to run after a difference has been selected."
450 "*Hooks to run after a difference has been unselected."
466 set local variables that determine how the display looks like."
509 (ediff-defvar-local ediff-skip-diff-region-function 'ediff-show-all-diffs
516 (ediff-defvar-local ediff-hide-regexp-matches-function
520 (ediff-defvar-local ediff-focus-on-regexp-matches-function
526 (ediff-defvar-local ediff-regexp-focus-A "" "")
528 (ediff-defvar-local ediff-regexp-focus-B "" "")
530 (ediff-defvar-local ediff-regexp-focus-C "" "")
533 (ediff-defvar-local ediff-focus-regexp-connective 'and "")
536 (ediff-defvar-local ediff-regexp-hide-A "" "")
538 (ediff-defvar-local ediff-regexp-hide-B "" "")
540 (ediff-defvar-local ediff-regexp-hide-C "" "")
543 (ediff-defvar-local ediff-hide-regexp-connective 'and "")
550 ;; from another buffer. This alist has the form:
553 (ediff-defvar-local ediff-killed-diffs-alist nil "")
558 (ediff-defvar-local ediff-syntax-table nil "")
586 (ediff-defvar-local ediff-use-faces t "")
597 (ediff-defvar-local ediff-word-mode nil "")
599 (ediff-defvar-local ediff-job-name nil "")
605 (ediff-defvar-local ediff-narrow-bounds nil "")
609 (ediff-defvar-local ediff-wide-bounds nil "")
615 (ediff-defvar-local ediff-visible-bounds nil "")
617 (ediff-defvar-local ediff-start-narrowed t
619 (ediff-defvar-local ediff-quit-widened t
630 (ediff-defvar-local ediff-highlight-all-diffs t "")
640 (ediff-defvar-local ediff-control-buffer-suffix nil "")
643 (ediff-defvar-local ediff-control-buffer-number nil "")
647 (ediff-defvar-local ediff-buffer-values-orig-A nil "")
649 (ediff-defvar-local ediff-buffer-values-orig-B nil "")
651 (ediff-defvar-local ediff-buffer-values-orig-C nil "")
653 (ediff-defvar-local ediff-buffer-values-orig-Ancestor nil "")
662 ;; Buffer-local variables to be saved then restored during Ediff sessions
676 ;; where each diff has the form:
682 (ediff-defvar-local ediff-difference-vector-A nil "")
683 (ediff-defvar-local ediff-difference-vector-B nil "")
684 (ediff-defvar-local ediff-difference-vector-C nil "")
685 (ediff-defvar-local ediff-difference-vector-Ancestor nil "")
699 (ediff-defvar-local ediff-state-of-merge nil "")
702 (ediff-defvar-local ediff-current-difference -1 "")
704 (ediff-defvar-local ediff-number-of-differences nil "")
708 (ediff-defvar-local ediff-diff-buffer nil "")
711 (ediff-defvar-local ediff-custom-diff-buffer nil "")
713 (ediff-defvar-local ediff-fine-diff-buffer nil "")
719 (ediff-defvar-local ediff-error-buffer nil "")
721 (ediff-defvar-local ediff-debug-buffer "*ediff-debug*" "")
725 (ediff-defvar-local ediff-this-buffer-ediff-sessions nil "")
812 ;; A var local to each control panel buffer. Indicates highlighting style
815 (ediff-defvar-local ediff-highlighting-style
816 (if (and (ediff-has-face-support-p) ediff-use-faces) 'face 'ascii)
820 (if (ediff-has-face-support-p)
893 (set-face-background-pixmap face pixmap)
899 (if (and (ediff-has-face-support-p)
909 (:foreground "firebrick" :background "pale green"))
911 (:foreground "blue3" :background "yellow3"))
913 '((((type tty)) (:foreground "blue3" :background "yellow3"))
914 (((class color)) (:foreground "firebrick" :background "pale green"))
929 (ediff-has-face-support-p)
938 (:foreground "DarkOrchid" :background "Yellow"))
940 (:foreground "magenta3" :background "yellow3"
943 '((((type tty)) (:foreground "magenta3" :background "yellow3"
945 (((class color)) (:foreground "DarkOrchid" :background "Yellow"))
960 (ediff-has-face-support-p)
968 (:foreground "Navy" :background "Pink"))
970 (:foreground "cyan3" :background "yellow3" :weight bold))
972 '((((type tty)) (:foreground "cyan3" :background "yellow3" :weight bold))
973 (((class color)) (:foreground "Navy" :background "Pink"))
988 (ediff-has-face-support-p)
996 (:foreground "Black" :background "VioletRed"))
998 (:foreground "black" :background "magenta3"))
1000 '((((type tty)) (:foreground "black" :background "magenta3"))
1001 (((class color)) (:foreground "Black" :background "VioletRed"))
1016 (ediff-has-face-support-p)
1024 (:foreground "Navy" :background "sky blue"))
1026 (:foreground "white" :background "sky blue" :weight bold))
1028 '((((type tty)) (:foreground "white" :background "sky blue" :weight bold))
1029 (((class color)) (:foreground "Navy" :background "sky blue"))
1045 (:foreground "Black" :background "cyan"))
1047 (:foreground "magenta3" :background "cyan3"))
1049 '((((type tty)) (:foreground "magenta3" :background "cyan3"))
1050 (((class color)) (:foreground "Black" :background "cyan"))
1066 (:foreground "white" :background "Turquoise"))
1068 (:foreground "Black" :background "Turquoise"))
1070 (:foreground "yellow3" :background "Turquoise"
1073 '((((type tty)) (:foreground "yellow3" :background "Turquoise"
1075 (((type pc)) (:foreground "white" :background "Turquoise"))
1076 (((class color)) (:foreground "Black" :background "Turquoise"))
1092 (:foreground "Black" :background "Green"))
1094 (:foreground "red3" :background "green"))
1096 '((((type tty)) (:foreground "red3" :background "green"))
1097 (((class color)) (:foreground "Black" :background "Green"))
1114 (cond ((not (ediff-has-face-support-p)) nil)
1124 (:foreground "green3" :background "light grey"))
1126 (:foreground "Black" :background "light grey"))
1128 (:foreground "red3" :background "light grey"
1131 `((((type tty)) (:foreground "red3" :background "light grey"
1133 (((type pc)) (:foreground "green3" :background "light grey"))
1134 (((class color)) (:foreground "Black" :background "light grey"))
1150 (:foreground "White" :background "Grey"))
1152 (:foreground "blue3" :background "Grey" :weight bold))
1154 `((((type tty)) (:foreground "blue3" :background "Grey" :weight bold))
1155 (((class color)) (:foreground "White" :background "Grey"))
1171 (:foreground "yellow3" :background "light grey"))
1173 (:foreground "Black" :background "light grey"))
1175 (:foreground "yellow3" :background "light grey"
1178 `((((type tty)) (:foreground "yellow3" :background "light grey"
1180 (((type pc)) (:foreground "yellow3" :background "light grey"))
1181 (((class color)) (:foreground "Black" :background "light grey"))
1197 (:foreground "cyan3" :background "light grey"))
1199 (:foreground "White" :background "Grey"))
1201 (:foreground "cyan3" :background "light grey"
1204 `((((type tty)) (:foreground "cyan3" :background "light grey"
1206 (((type pc)) (:foreground "cyan3" :background "light grey"))
1207 (((class color)) (:foreground "White" :background "Grey"))
1230 (:foreground "green3" :background "gray40"))
1232 (:foreground "White" :background "Grey"))
1234 (:foreground "red3" :background "black" :weight bold))
1236 '((((type tty)) (:foreground "red3" :background "black" :weight bold))
1237 (((type pc)) (:foreground "green3" :background "gray40"))
1238 (((class color)) (:foreground "White" :background "Grey"))
1255 (:foreground "White" :background "gray40"))
1257 (:foreground "Black" :background "light grey"))
1259 (:foreground "cyan3" :background "black" :weight bold))
1261 '((((type tty)) (:foreground "cyan3" :background "black" :weight bold))
1262 (((type pc)) (:foreground "White" :background "gray40"))
1263 (((class color)) (:foreground "Black" :background "light grey"))
1279 (:foreground "yellow3" :background "gray40"))
1281 (:foreground "White" :background "Grey"))
1283 (:foreground "yellow3" :background "black" :weight bold))
1285 '((((type tty)) (:foreground "yellow3" :background "black" :weight bold))
1286 (((type pc)) (:foreground "yellow3" :background "gray40"))
1287 (((class color)) (:foreground "White" :background "Grey"))
1303 (:foreground "cyan3" :background "gray40"))
1305 (:foreground "green3" :background "black" :weight bold))
1307 '((((type tty)) (:foreground "green3" :background "black" :weight bold))
1308 (((class color)) (:foreground "cyan3" :background "gray40"))
1351 (ediff-defvar-local ediff-current-diff-overlay-A nil
1353 (ediff-defvar-local ediff-current-diff-overlay-B nil
1355 (ediff-defvar-local ediff-current-diff-overlay-C nil
1357 (ediff-defvar-local ediff-current-diff-overlay-Ancestor nil
1419 (make-variable-buffer-local 'ediff-autostore-merges)
1422 (ediff-defvar-local ediff-merge-store-file nil "")
1472 (ediff-defvar-local ediff-temp-file-A nil "")
1474 (ediff-defvar-local ediff-temp-file-B nil "")
1476 (ediff-defvar-local ediff-temp-file-C nil "")
1484 (let ((handler (find-file-name-handler file-name 'file-local-copy)))
1503 (defsubst ediff-background-face (buf-type dif-num)
1514 (defun ediff-paint-background-regions-in-one-buffer (buf-type unhighlight)
1527 (ediff-background-face buf-type diff-num))))
1533 (defun ediff-paint-background-regions (&optional unhighlight)
1534 (ediff-paint-background-regions-in-one-buffer
1536 (ediff-paint-background-regions-in-one-buffer
1538 (ediff-paint-background-regions-in-one-buffer
1540 (ediff-paint-background-regions-in-one-buffer
1877 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)