• Home
  • History
  • Annotate
  • Raw
  • Download
  • only in /macosx-10.9.5/emacs-92/emacs/lisp/

Lines Matching +defs:overlays +defs:in

15 ;; GNU Emacs is distributed in the hope that it will be useful,
72 ;; in XEmacs: device-type is tty on tty and stream in batch.
85 ;; toolbar support for emacs hasn't been implemented in ediff
123 ;; The buffer in which the A variant is stored.
125 ;; The buffer in which the B variant is stored.
127 ;; The buffer in which the C variant is stored or where the merge buffer lives.
197 ;; t if the diffs are whitespace in all buffers
198 ;; 'A (in 3-buf comparison only) if there are only whitespace
199 ;; diffs in bufs B and C
200 ;; 'B (in 3-buf comparison only) if there are only whitespace
201 ;; diffs in bufs A and C
202 ;; 'C (in 3-buf comparison only) if there are only whitespace
203 ;; diffs in bufs A and B
212 ;; different from the other two (used only in 3-way jobs).
247 ;; the differences are in white space only. If flag is nil,
249 ;; not just in the white space and newlines.)
383 ;; with no argument, checks if we are in ediff-control-buffer
384 ;; with argument, checks if we are in ediff-meta-buffer
385 (defun ediff-in-control-buffer-p (&optional meta-buf-p)
391 (or (ediff-in-control-buffer-p meta-buf-p)
392 (error "%S: This command runs in Ediff Control Buffer only!"
396 "Hilighting of difference regions in Ediff."
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."
464 "*Hook run just after ediff-mode is set up in the control buffer.
470 "*Hook run just after the default bindings in Ediff keymap are set up."
480 "*Hooks to run in the Ediff control buffer when Ediff is suspended."
484 "*Hooks to run in the Ediff control buffer after finishing Ediff."
518 "Function to use in determining which regions to hide.
522 "Function to use in determining which regions to focus on.
555 ;; Syntax table to use in ediff-forward-word-function
575 "*Flag placed before a highlighted block of differences, if block starts in mid-line."
577 :tag "Region before-flag in the middle of line"
580 "*Flag placed after a highlighted block of differences, if block ends in mid-line."
582 :tag "Region after-flag in the middle of line"
596 ;; permanently nixed; used in ediff-windows-wordwise and ediff-regions-wordwise
604 ;; the bounds of these overlays.
611 ;; Current visibility boundaries in buffers A, B, and C.
612 ;; This is also a list of overlays. When the user toggles narrow/widen,
634 shown in brighter colors."
668 ;; represented by a vector of two overlays plus a vector of fine diffs,
670 ;; difference region in the A buffer and the second overlays the diff in
681 ;; different from the other two (used only in 3-way jobs.
696 ;; indicates the way a diff region was created in buffer C.
697 ;; state-of-ancestor says if the corresponding region in ancestor buffer is
710 ;; Ediff, but it is saved in a file, if user requests so.
724 ;; Not used any more, but may be needed in the future.
727 ;; to be deleted in due time
728 ;; List of difference overlays disturbed by working with the current diff.
729 (defvar ediff-disturbed-overlays nil "")
731 ;; Priority of non-selected overlays.
745 In most cases, the default will do. However, under certain circumstances in
780 ;; incorrect. However, this gives correct result in our cases, since we are
796 (error "%S: Invalid op in ediff-check-version" op))))
813 ;; in effect for this buffer: `face', `ascii',
875 ;; This happens only for refinement overlays
916 "Face for highlighting the selected difference in buffer A."
921 "Face for highlighting the selected difference in buffer A.
947 "Face for highlighting the selected difference in buffer B."
952 "Face for highlighting the selected difference in buffer B.
975 "Face for highlighting the selected difference in buffer C."
980 "Face for highlighting the selected difference in buffer C.
1003 "Face for highlighting the selected difference in buffer Ancestor."
1008 "Face for highlighting the selected difference in buffer Ancestor.
1031 "Face for highlighting the refinement of the selected diff in buffer A."
1036 "Face for highlighting the fine differences in buffer A.
1052 "Face for highlighting the refinement of the selected diff in buffer B."
1057 "Face for highlighting the fine differences in buffer B.
1078 "Face for highlighting the refinement of the selected diff in buffer C."
1083 "Face for highlighting the fine differences in buffer C.
1099 "Face for highlighting the refinement of the selected diff in the ancestor buffer.
1106 "Face for highlighting the fine differences in buffer Ancestor.
1112 ;; Some installs don't have stipple or Stipple. So, try them in turn.
1136 "Face for highlighting even-numbered non-current differences in buffer A."
1141 "Face for highlighting even-numbered non-current differences in buffer A.
1157 "Face for highlighting even-numbered non-current differences in buffer B."
1162 "Face for highlighting even-numbered non-current differences in buffer B.
1183 "Face for highlighting even-numbered non-current differences in buffer C."
1188 "Face for highlighting even-numbered non-current differences in buffer C.
1209 "Face for highlighting even-numbered non-current differences in the ancestor buffer."
1214 "Face for highlighting even-numbered non-current differences in buffer Ancestor.
1240 "Face for highlighting odd-numbered non-current differences in buffer A."
1245 "Face for highlighting odd-numbered non-current differences in buffer A.
1265 "Face for highlighting odd-numbered non-current differences in buffer B."
1270 "Face for highlighting odd-numbered non-current differences in buffer B.
1289 "Face for highlighting odd-numbered non-current differences in buffer C."
1294 "Face for highlighting odd-numbered non-current differences in buffer C.
1310 "Face for highlighting odd-numbered non-current differences in the ancestor buffer."
1315 "Face for highlighting odd-numbered non-current differences in buffer Ancestor.
1352 "Overlay for the current difference region in buffer A.")
1354 "Overlay for the current difference region in buffer B.")
1356 "Overlay for the current difference region in buffer C.")
1358 "Overlay for the current difference region in the ancestor buffer.")
1369 (setq ovr-list (append (overlays-at pos) ovr-list))
1378 ;; exclude ediff overlays from priority
1429 (defcustom ediff-no-emacs-help-in-control-buffer nil
1430 "*Non-nil means C-h should not invoke Emacs help in control buffer.
1462 "Regexp that matches characters that must be quoted with `\\' in shell command line.
1467 ;; needed to simulate frame-char-width in XEmacs.
1471 ;; Temporary file used for refining difference regions in buffer A.
1473 ;; Temporary file used for refining difference regions in buffer B.
1475 ;; Temporary file used for refining difference regions in buffer C.
1513 ;; activate faces on diff regions in buffer
1514 (defun ediff-paint-background-regions-in-one-buffer (buf-type unhighlight)
1532 ;; activate faces on diff regions in all buffers
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
1544 ;; arg is a record for a given diff in a difference vector
1551 (defsubst ediff-clear-fine-differences-in-one-buffer (n buf-type)
1556 (ediff-clear-fine-differences-in-one-buffer n 'A)
1557 (ediff-clear-fine-differences-in-one-buffer n 'B)
1559 (ediff-clear-fine-differences-in-one-buffer n 'C)))
1636 ;; sessions that are not part of a group (this is done in
1638 ;; sessions in session groups (in which case mouse is warped into
1649 ;; xemacs behave differently when mouse is not in any frame. Also, this is
1695 ;; like overlay-buffer in Emacs. In XEmacs, returns nil if the extent is
1703 ;; like overlay-get in Emacs. In XEmacs, returns nil if the extent is
1713 ;; handle overlays whose buffers were deleted.
1715 "Calls `move-overlay' in Emacs and `set-extent-endpoints' in Lemacs.
1777 (unless (fboundp 'subst-char-in-string)
1778 (defun subst-char-in-string (fromchar tochar string &optional inplace)
1779 "Replace FROMCHAR with TOCHAR in STRING each time it occurs.
1812 (subst-char-in-string ?- ?\s (substring (symbol-name jobname) 6))))
1857 ;; stolen from subr.el in emacs 21