emacs/lisp/ediff-init.el

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
226 (defmacro ediff-set-fine-diff-vector (n buf-type fine-vec)
232 (defmacro ediff-set-state-of-diff (n buf-type val)
238 (defmacro ediff-set-state-of-merge (n val)
263 	 (set-buffer ,buffer)
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 "")
413   "*Hooks to run before Ediff begins to set up windows and buffers.
427 This can be used to set up control window or icon in a desired place."
442   "*Hooks to run in the control buffer after Ediff has been set up and is ready for the job."
454   "*Hooks run after buffers A, B, and C are set up.
464   "*Hook run just after ediff-mode is set up in the control buffer.
466 set local variables that determine how the display looks like."
470   "*Hook run just after the default bindings in Ediff keymap are set up."
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 "")
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 "")
603 ;; If set, Ediff compares only those parts of buffers A/B/C that lie within
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
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
863 (defun ediff-set-overlay-face (extent face)
889 (defun ediff-set-face-pixmap (face pixmap)
893 	  (set-face-background-pixmap face pixmap)
919 ;; this variable is set to nil, then again to the appropriate face.
950 ;; this variable is set to nil, then again to the appropriate face.
978 ;; this variable is set to nil, then again to the appropriate face.
1006 ;; this variable is set to nil, then again to the appropriate face.
1034 ;; this variable is set to nil, then again to the appropriate face.
1055 ;; this variable is set to nil, then again to the appropriate face.
1081 ;; this variable is set to nil, then again to the appropriate face.
1104 ;; this variable is set to nil, then again to the appropriate face.
1139 ;; this variable is set to nil, then again to the appropriate face.
1160 ;; this variable is set to nil, then again to the appropriate face.
1186 ;; this variable is set to nil, then again to the appropriate face.
1212 ;; this variable is set to nil, then again to the appropriate face.
1243 ;; this variable is set to nil, then again to the appropriate face.
1268 ;; this variable is set to nil, then again to the appropriate face.
1292 ;; this variable is set to nil, then again to the appropriate face.
1313 ;; this variable is set to nil, then again to the appropriate face.
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)))
1524 		  (ediff-set-overlay-face
1553   (ediff-set-fine-diff-vector n buf-type nil))
1569 (defsubst ediff-key-press-event-p (event)
1571    (key-press-event-p event) ; xemacs form
1582 	((ediff-key-press-event-p event)
1593 	((ediff-key-press-event-p event)
1597 (defun ediff-event-key (event-or-key)
1599    (if (eventp event-or-key) (event-key event-or-key) event-or-key) ; xemacs
1600    event-or-key   ; emacs form
1632 	    ;; don't set mouse if the user said to never do this
1642 	    (set-mouse-position frame-or-wind 1 0))
1715   "Calls `move-overlay' in Emacs and `set-extent-endpoints' in Lemacs.
1720 	 (set-extent-endpoints overlay beg end) ; xemacs form
1728   "Calls `overlay-put' or `set-extent-property' depending on Emacs version.
1732        (set-extent-property overlay prop value) ; xemacs form
1865 	       (set-syntax-table (copy-syntax-table ,table))
1868 	     (set-buffer ,old-buffer)
1869 	     (set-syntax-table ,old-table)))))))
1877 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)