;;; Commentary:
;;; Code:
-
+
(provide 'ediff-util)
;; Compiler pacifier
(setq mode-name "Ediff")
(run-hooks 'ediff-mode-hook))
-
+
\f
;;; Build keymaps
(if (null ediff-mode-map)
(ediff-setup-keymap))
(use-local-map ediff-mode-map))
-
+
;; Reload Ediff keymap. For debugging only.
(defun ediff-reload-keymap ()
(interactive)
(setq ediff-mode-map nil)
(ediff-set-keys))
-
+
(defun ediff-setup-keymap ()
"Set up the keymap used in the control buffer of Ediff."
(setq ediff-mode-map (make-sparse-keymap))
(suppress-keymap ediff-mode-map)
-
+
(define-key ediff-mode-map
(if ediff-emacs-p [mouse-2] [button2]) 'ediff-help-for-quick-help)
(define-key ediff-mode-map "\C-m" 'ediff-help-for-quick-help)
))
(define-key ediff-mode-map "m" 'ediff-toggle-wide-display)
-
+
;; Allow ediff-mode-map to be referenced indirectly
(fset 'ediff-mode-map ediff-mode-map)
(run-hooks 'ediff-keymap-setup-hook))
(ediff-convert-standard-filename (expand-file-name file-C))))
(if (stringp merge-buffer-file)
(progn
- (setq merge-buffer-file
+ (setq merge-buffer-file
(ediff-convert-standard-filename
(expand-file-name merge-buffer-file)))
;; check the directory exists
(or (file-exists-p (file-name-directory merge-buffer-file))
(error "Directory %s given as place to save the merge doesn't exist"
- (abbreviate-file-name
+ (abbreviate-file-name
(file-name-directory merge-buffer-file))))
(if (and (file-exists-p merge-buffer-file)
(file-directory-p merge-buffer-file))
(error "The merge buffer file %s must not be a directory"
(abbreviate-file-name merge-buffer-file)))
))
- (let* ((control-buffer-name
+ (let* ((control-buffer-name
(ediff-unique-buffer-name "*Ediff Control Panel" "*"))
(control-buffer (ediff-with-current-buffer buffer-A
(get-buffer-create control-buffer-name))))
(ediff-with-current-buffer control-buffer
- (ediff-mode)
-
+ (ediff-mode)
+
(make-local-variable 'ediff-use-long-help-message)
(make-local-variable 'ediff-prefer-iconified-control-frame)
(make-local-variable 'ediff-split-window-function)
(while setup-parameters
(set (car (car setup-parameters)) (cdr (car setup-parameters)))
(setq setup-parameters (cdr setup-parameters)))
-
+
;; set variables classifying the current ediff job
;; must come AFTER setup-parameters
(setq ediff-3way-comparison-job (ediff-3way-comparison-job)
(if (ediff-window-display-p)
(add-hook 'pre-command-hook 'ediff-spy-after-mouse nil 'local))
(setq ediff-mouse-pixel-position (mouse-pixel-position))
-
+
;; adjust for merge jobs
(if ediff-merge-job
(let ((buf
(cond ((eq ediff-default-variant 'default-B)
buffer-B)
(t buffer-A))))
-
+
(setq ediff-split-window-function
- ediff-merge-split-window-function)
-
+ ediff-merge-split-window-function)
+
;; remember the ancestor buffer, if any
(setq ediff-ancestor-buffer buffer-C)
-
+
(setq buffer-C
(get-buffer-create
(ediff-unique-buffer-name "*ediff-merge" "*")))
(widen) ; merge buffer is always widened
(add-hook 'local-write-file-hooks 'ediff-set-merge-mode nil t)
)))
- (setq buffer-read-only nil
+ (setq buffer-read-only nil
ediff-buffer-A buffer-A
ediff-buffer-B buffer-B
ediff-buffer-C buffer-C
ediff-control-buffer control-buffer)
(ediff-choose-syntax-table)
-
+
(setq ediff-control-buffer-suffix
(if (string-match "<[0-9]*>" control-buffer-name)
(substring control-buffer-name
(or
(string-match "[0-9]+" ediff-control-buffer-suffix)
0))))))
-
+
(setq ediff-error-buffer
(get-buffer-create (ediff-unique-buffer-name "*ediff-errors" "*")))
-
+
(ediff-with-current-buffer buffer-A (ediff-strip-mode-line-format))
(ediff-with-current-buffer buffer-B (ediff-strip-mode-line-format))
(if ediff-3way-job
(if (ediff-buffer-live-p ediff-ancestor-buffer)
(ediff-with-current-buffer ediff-ancestor-buffer
(ediff-strip-mode-line-format)))
-
+
(ediff-save-protected-variables) ; save variables to be restored on exit
-
+
;; ediff-setup-diff-regions-function must be set after setup
;; parameters are processed.
(setq ediff-setup-diff-regions-function
(if ediff-diff3-job
'ediff-setup-diff-regions3
'ediff-setup-diff-regions))
-
+
(setq ediff-wide-bounds
(list (ediff-make-bullet-proof-overlay
'(point-min) '(point-max) ediff-buffer-A)
'(point-min) '(point-max) ediff-buffer-B)
(ediff-make-bullet-proof-overlay
'(point-min) '(point-max) ediff-buffer-C)))
-
+
;; This has effect only on ediff-windows/regions
;; In all other cases, ediff-visible-region sets visibility bounds to
;; ediff-wide-bounds, and ediff-narrow-bounds are ignored.
(if ediff-start-narrowed
(setq ediff-visible-bounds ediff-narrow-bounds)
(setq ediff-visible-bounds ediff-wide-bounds))
-
+
(ediff-set-keys) ; comes after parameter setup
-
+
;; set up ediff-narrow-bounds, if not set
(or ediff-narrow-bounds
(setq ediff-narrow-bounds ediff-wide-bounds))
-
+
;; All these must be inside ediff-with-current-buffer control-buffer,
;; since these vars are local to control-buffer
;; These won't run if there are errors in diff
(or (memq control-buffer ediff-this-buffer-ediff-sessions)
(setq ediff-this-buffer-ediff-sessions
(cons control-buffer
- ediff-this-buffer-ediff-sessions)))
+ ediff-this-buffer-ediff-sessions)))
(if ediff-make-buffers-readonly-at-startup
(setq buffer-read-only t)
(setq buffer-read-only nil))
(cons control-buffer
ediff-this-buffer-ediff-sessions)))
))
-
+
;; the following must be after setting up ediff-narrow-bounds AND after
;; nuking selective display
(funcall ediff-setup-diff-regions-function file-A file-B file-C)
(setq ediff-number-of-differences (length ediff-difference-vector-A))
(setq ediff-current-difference -1)
-
+
(ediff-make-current-diff-overlay 'A)
(ediff-make-current-diff-overlay 'B)
(if ediff-3way-job
(ediff-make-current-diff-overlay 'C))
(if ediff-merge-with-ancestor-job
(ediff-make-current-diff-overlay 'Ancestor))
-
+
(ediff-setup-windows buffer-A buffer-B buffer-C control-buffer)
-
+
(let ((shift-A (ediff-overlay-start
(ediff-get-value-according-to-buffer-type
'A ediff-narrow-bounds)))
(select-window ediff-window-C)
(goto-char shift-C)))
)
-
+
(select-window ediff-control-window)
(ediff-visible-region)
-
+
(run-hooks 'startup-hooks)
(ediff-arrange-autosave-in-merge-jobs merge-buffer-file)
(run-hooks 'ediff-startup-hook)
) ; eval in control-buffer
control-buffer))
-
-
+
+
;; This function assumes that we are in the window where control buffer is
-;; to reside.
+;; to reside.
(defun ediff-setup-control-buffer (ctl-buf)
"Set up window for control buffer."
(if (window-dedicated-p (selected-window))
(ediff-make-bottom-toolbar)) ; this checks if toolbar is requested
(goto-char (point-min))
(skip-chars-forward ediff-whitespace)))
-
+
;; This executes in control buffer and sets auto-save, visited file name, etc,
;; in the merge buffer
(defun ediff-arrange-autosave-in-merge-jobs (merge-buffer-file)
(progn
;; save before leaving ctl buffer
(ediff-verify-file-merge-buffer ediff-merge-store-file)
- (setq merge-buffer-file ediff-merge-store-file)
+ (setq merge-buffer-file ediff-merge-store-file)
(ediff-with-current-buffer ediff-buffer-C
(set-visited-file-name merge-buffer-file))))
(ediff-with-current-buffer ediff-buffer-C
\f
;;; Commands for working with Ediff
-
+
(defun ediff-update-diffs ()
"Recompute difference regions in buffers A, B, and C.
Buffers are not synchronized with their respective files, so changes done
(y-or-n-p
"Ancestor buffer will not be used. Recompute diffs anyway? ")))
(error "Recomputation of differences canceled"))
-
+
(let ((point-A (ediff-with-current-buffer ediff-buffer-A (point)))
;;(point-B (ediff-with-current-buffer ediff-buffer-B (point)))
(tmp-buffer (get-buffer-create ediff-tmp-buffer))
(setq buf-C-file-name (file-name-nondirectory buf-C-file-name)))
(ediff-unselect-and-select-difference -1)
-
+
(setq beg-A (ediff-overlay-start overl-A)
beg-B (ediff-overlay-start overl-B)
beg-C (ediff-overlay-start overl-C)
end-A (ediff-overlay-end overl-A)
end-B (ediff-overlay-end overl-B)
end-C (ediff-overlay-end overl-C))
-
+
(if ediff-word-mode
(progn
(ediff-wordify beg-A end-A ediff-buffer-A tmp-buffer)
(if ediff-3way-job
(setq file-C (ediff-make-temp-file ediff-buffer-C buf-C-file-name)))
)
-
+
(ediff-clear-diff-vector 'ediff-difference-vector-A 'fine-diffs-also)
(ediff-clear-diff-vector 'ediff-difference-vector-B 'fine-diffs-also)
(ediff-clear-diff-vector 'ediff-difference-vector-C 'fine-diffs-also)
ediff-state-of-merge nil)
(setq ediff-killed-diffs-alist nil) ; invalidate saved killed diff regions
-
+
;; In case of merge job, fool it into thinking that it is just doing
;; comparison
(let ((ediff-setup-diff-regions-function ediff-setup-diff-regions-function)
ediff-merge-with-ancestor-job nil
ediff-job-name 'ediff-files3))
(funcall ediff-setup-diff-regions-function file-A file-B file-C))
-
+
(setq ediff-number-of-differences (length ediff-difference-vector-A))
(delete-file file-A)
(delete-file file-B)
(if file-C
(delete-file file-C))
-
+
(if ediff-3way-job
(ediff-set-state-of-all-diffs-in-all-buffers ediff-control-buffer))
-
+
(ediff-jump-to-difference (ediff-diff-at-point 'A point-A))
(message "")
))
-
+
;; Not bound to any key---to dangerous. A user can do it if necessary.
(defun ediff-revert-buffers-then-recompute-diffs (noconfirm)
"Revert buffers A, B and C. Then rerun Ediff on file A and file B."
(ediff-update-diffs))))
-;; optional NO-REHIGHLIGHT says to not rehighlight buffers
+;; optional NO-REHIGHLIGHT says to not rehighlight buffers
(defun ediff-recenter (&optional no-rehighlight)
"Bring the highlighted region of all buffers being compared into view.
Reestablish the default three-window display."
(message ediff-KILLED-VITAL-BUFFER
(beep 1)))
))
-
+
;; set visibility range appropriate to this invocation of Ediff.
(ediff-visible-region)
;; raise
(not ediff-use-long-help-message)
(not (ediff-frame-iconified-p ediff-control-frame)))
(raise-frame ediff-control-frame))
-
+
;; Redisplay whatever buffers are showing, if there is a selected difference
(let ((control-frame ediff-control-frame)
(control-buf ediff-control-buffer))
(progn
(or no-rehighlight
(ediff-select-difference ediff-current-difference))
-
+
(ediff-recenter-one-window 'A)
(ediff-recenter-one-window 'B)
(if ediff-3way-job
(ediff-recenter-one-window 'C))
-
+
(ediff-with-current-buffer control-buf
(ediff-recenter-ancestor) ; check if ancestor is alive
-
+
(if (and (ediff-multiframe-setup-p)
(not ediff-use-long-help-message)
(not (ediff-frame-iconified-p ediff-control-frame)))
(ediff-restore-highlighting)
(ediff-with-current-buffer control-buf (ediff-refresh-mode-lines))
))
-
+
;; this function returns to the window it was called from
;; (which was the control window)
(defun ediff-recenter-one-window (buf-type)
;; context must be saved before switching to windows A/B/C
(let* ((ctl-wind (selected-window))
(shift (ediff-overlay-start
- (ediff-get-value-according-to-buffer-type
+ (ediff-get-value-according-to-buffer-type
buf-type ediff-narrow-bounds)))
(job-name ediff-job-name)
(control-buf ediff-control-buffer)
buf-type ediff-window-alist))
(window (if (window-live-p (symbol-value window-name))
(symbol-value window-name))))
-
+
(if (and window ediff-windows-job)
(set-window-start window shift))
(if window
(select-window ctl-wind)
)))
-
+
;; This will have to be refined for 3way jobs
(defun ediff-toggle-split ()
- "Toggle vertical/horizontal window split.
+ "Toggle vertical/horizontal window split.
Does nothing if file-A and file-B are in different frames."
(interactive)
(ediff-barf-if-not-control-buffer)
'split-window-vertically))
(message "Buffers being compared are in different frames"))
(ediff-recenter 'no-rehighlight)))
-
+
(defun ediff-toggle-hilit ()
"Switch between highlighting using ASCII flags and highlighting using faces.
-On a dumb terminal, switches between ASCII highlighting and no highlighting."
+On a dumb terminal, switches between ASCII highlighting and no highlighting."
(interactive)
(ediff-barf-if-not-control-buffer)
(setq ediff-use-faces t
ediff-highlighting-style 'face
ediff-highlight-all-diffs t)))
-
+
(if (and ediff-use-faces ediff-highlight-all-diffs)
(ediff-paint-background-regions)
(ediff-paint-background-regions 'unhighlight))
-
+
(ediff-unselect-and-select-difference
ediff-current-difference 'select-only))
-
+
(defun ediff-toggle-autorefine ()
"Toggle auto-refine mode."
(interactive)
(cond ((setq wind (ediff-get-visible-buffer-window ediff-ancestor-buffer))
(raise-frame (window-frame wind)))
(t (set-window-buffer ediff-window-C ediff-ancestor-buffer)))))
-
+
(defun ediff-make-or-kill-fine-diffs (arg)
"Compute fine diffs. With negative prefix arg, kill fine diffs.
-In both cases, operates on the current difference region."
+In both cases, operates on the current difference region."
(interactive "P")
(ediff-barf-if-not-control-buffer)
(cond ((eq arg '-)
((and (numberp arg) (< arg 0))
(ediff-clear-fine-differences ediff-current-difference))
(t (ediff-make-fine-diffs))))
-
-
+
+
(defun ediff-toggle-help ()
"Toggle short/long help message."
(interactive)
(if (and ediff-use-long-help-message (ediff-multiframe-setup-p))
(setq ediff-prefer-iconified-control-frame
(ediff-frame-iconified-p ediff-control-frame)))
-
+
(setq ediff-window-config-saved "") ; force redisplay
(ediff-recenter 'no-rehighlight))
-
-
+
+
;; If BUF, this is the buffer to toggle, not current buffer.
(defun ediff-toggle-read-only (&optional buf)
"Toggle read-only in current buffer.
(or buf (ediff-recenter))
(or buf
(setq buf (ediff-get-buffer buf-type)))
-
+
(ediff-with-current-buffer buf ; eval in buf A/B/C
(let* ((file (buffer-file-name buf))
(file-writable (and file
(message
"Boy, this is risky! Don't modify this file...")
(sit-for 3)))) ; let the user see the warning
- (if (and toggle-ro-cmd
+ (if (and toggle-ro-cmd
(string-match "toggle-read-only" (symbol-name toggle-ro-cmd)))
(save-excursion
(save-window-excursion
(select-window (ediff-get-visible-buffer-window buf))
(command-execute toggle-ro-cmd)))
(error "Don't know how to toggle read-only in buffer %S" buf))
-
+
;; Check if we made the current buffer updatable, but its file is RO.
;; Signal a warning in this case.
(if (and file (not buffer-read-only)
(ediff-abbreviate-file-name file))))
(ediff-with-current-buffer buf
(command-execute checkout-function)))))
-
+
;; This is a simple-minded check for whether a file is under version control.
;; If file,v exists but file doesn't, this file is considered to be not checked
;; XEmacs has no vc-state
(vc-locking-user file))
)))
-
+
(defsubst ediff-file-checked-in-p (file)
(and (featurep 'vc-hooks)
;; CVS files are considered not checked in
(if (featurep 'jka-compr)
(string-match (jka-compr-build-file-regexp) file)))
-
+
(defun ediff-swap-buffers ()
"Rotate the display of buffers A, B, and C."
(interactive)
ediff-buffer-B buf)
(setq ediff-buffer-A ediff-buffer-B
ediff-buffer-B buf))
-
+
;; swap saved buffer characteristics
(if ediff-3way-comparison-job
(setq ediff-buffer-values-orig-A ediff-buffer-values-orig-C
ediff-buffer-values-orig-B values)
(setq ediff-buffer-values-orig-A ediff-buffer-values-orig-B
ediff-buffer-values-orig-B values))
-
+
;; swap diff vectors
(if ediff-3way-comparison-job
(setq ediff-difference-vector-A ediff-difference-vector-C
ediff-difference-vector-B diff-vec)
(setq ediff-difference-vector-A ediff-difference-vector-B
ediff-difference-vector-B diff-vec))
-
+
;; swap hide/focus regexp
(if ediff-3way-comparison-job
(setq ediff-regexp-hide-A ediff-regexp-hide-C
ediff-regexp-hide-B hide-regexp
ediff-regexp-focus-A ediff-regexp-focus-B
ediff-regexp-focus-B focus-regexp))
-
+
;; The following is needed for XEmacs, since there one can't move
;; overlay to another buffer. In Emacs, this swap is redundant.
(if (ediff-has-face-support-p)
ediff-current-diff-overlay-B overlay)
(setq ediff-current-diff-overlay-A ediff-current-diff-overlay-B
ediff-current-diff-overlay-B overlay)))
-
+
;; swap wide bounds
(setq ediff-wide-bounds
(cond (ediff-3way-comparison-job
(list (nth 1 ediff-wide-bounds)
(nth 0 ediff-wide-bounds)
(nth 2 ediff-wide-bounds)))
- (t
+ (t
(list (nth 1 ediff-wide-bounds)
(nth 0 ediff-wide-bounds)))))
;; swap narrow bounds
(list (nth 1 ediff-narrow-bounds)
(nth 0 ediff-narrow-bounds)
(nth 2 ediff-narrow-bounds)))
- (t
+ (t
(list (nth 1 ediff-narrow-bounds)
(nth 0 ediff-narrow-bounds)))))
(if wide-visibility-p
(ediff-set-state-of-all-diffs-in-all-buffers ediff-control-buffer))
(ediff-recenter 'no-rehighlight)
)
-
+
(defun ediff-toggle-wide-display ()
"Toggle wide/regular display.
(ediff-with-current-buffer ctl-buf
(setq ediff-window-B nil) ; force update of window config
(ediff-recenter 'no-rehighlight)))))
-
+
;;;###autoload
(defun ediff-toggle-multiframe ()
"Switch from multiframe display to single-frame display and back.
(ediff-kill-bottom-toolbar))
;; do this only after killing the toolbar
(setq ediff-use-toolbar-p (not ediff-use-toolbar-p))
-
+
(mapcar (lambda(buf)
(ediff-with-current-buffer buf
;; force redisplay
;;(selected-frame).
;; The problem with this is that any previous bottom-toolbar
;; will not re-appear after our cleanup here. Is there a way
- ;; to do "push" and "pop" toolbars ? --marcpa
+ ;; to do "push" and "pop" toolbars ? --marcpa
(if (ediff-use-toolbar-p)
(ediff-cond-compile-for-xemacs-or-emacs
(progn ; xemacs
bottom-toolbar
(list frame (if (ediff-3way-comparison-job)
ediff-toolbar-3way ediff-toolbar)))
- (set-specifier bottom-toolbar-visible-p (list frame t))
+ (set-specifier bottom-toolbar-visible-p (list frame t))
(set-specifier bottom-toolbar-height
(list frame ediff-toolbar-height)))
nil ; emacs
)
))
))
-
+
;; Merging
(defun ediff-toggle-show-clashes-only ()
(message "Showing regions that differ from default setting")))
-
+
;; Widening/narrowing
(defun ediff-toggle-narrow-region ()
(setq ediff-visible-bounds ediff-narrow-bounds)
(setq ediff-visible-bounds ediff-wide-bounds))
(ediff-recenter 'no-rehighlight))
-
+
;; Narrow bufs A/B/C to ediff-visible-bounds. If this is currently set to
;; ediff-wide-bounds, then this actually widens.
;; This function does nothing if job-name is not
-;; ediff-regions-wordwise/linewise or ediff-windows-wordwise/linewise.
+;; ediff-regions-wordwise/linewise or ediff-windows-wordwise/linewise.
;; Does nothing if buffer-A = buffer-B since we can't narrow
;; to two different regions in one buffer.
(defun ediff-visible-region ()
(if (ediff-overlay-buffer overl-B)
(narrow-to-region
(ediff-overlay-start overl-B) (ediff-overlay-end overl-B))))
-
+
(if (and ediff-3way-job (ediff-overlay-buffer overl-C))
(ediff-with-current-buffer ediff-buffer-C
(narrow-to-region
(ediff-overlay-start overl-C) (ediff-overlay-end overl-C))))
)))
-
+
;; Window scrolling operations
;; Usually, errors come from scrolling off the
;; beginning or end of the buffer, and this gives error messages.
(defun ediff-operate-on-windows (operation arg)
-
+
;; make sure windows aren't dead
(if (not (and (window-live-p ediff-window-A) (window-live-p ediff-window-B)))
(ediff-recenter 'no-rehighlight))
(or (not ediff-3way-job) ediff-buffer-C)
))
(error ediff-KILLED-VITAL-BUFFER))
-
+
(let* ((wind (selected-window))
(wind-A ediff-window-A)
(wind-B ediff-window-B)
(three-way ediff-3way-job)
(coefC (if three-way
(ediff-get-region-size-coefficient 'C operation))))
-
+
(select-window wind-A)
(condition-case nil
(funcall operation (round (* coefA arg)))
the one half of the height of window-A."
(interactive "P")
(ediff-barf-if-not-control-buffer)
-
+
;; make sure windows aren't dead
(if (not (and (window-live-p ediff-window-A) (window-live-p ediff-window-B)))
(ediff-recenter 'no-rehighlight))
(ediff-buffer-live-p ediff-buffer-C))
))
(error ediff-KILLED-VITAL-BUFFER))
-
+
(ediff-operate-on-windows
(if (memq last-command-char '(?v ?\C-v))
- 'scroll-up
+ 'scroll-up
'scroll-down)
;; calculate argument to scroll-up/down
;; if there is an explicit argument
(prefix-numeric-value arg)
;; if not, see if we can determine a default amount (the window height)
(let (default-amount)
- (setq default-amount
+ (setq default-amount
(- (/ (min (window-height ediff-window-A)
(window-height ediff-window-B)
(if ediff-3way-job
the width of the A/B/C windows."
(interactive "P")
(ediff-barf-if-not-control-buffer)
-
+
;; make sure windows aren't dead
(if (not (and (window-live-p ediff-window-A) (window-live-p ediff-window-B)))
(ediff-recenter 'no-rehighlight))
(ediff-buffer-live-p ediff-buffer-C))
))
(error ediff-KILLED-VITAL-BUFFER))
-
+
(ediff-operate-on-windows
;; Arrange for scroll-left and scroll-right being called
;; interactively so that they set the window's min_hscroll.
;; Otherwise, automatic hscrolling will undo the effect of
;; hscrolling.
(if (= last-command-char ?<)
- (lambda (arg)
+ (lambda (arg)
(let ((prefix-arg arg))
(call-interactively 'scroll-left)))
(lambda (arg)
;;BEG, END show the region to be positioned.
;;JOB-NAME holds ediff-job-name. The ediff-windows job positions regions
-;;differently.
+;;differently.
(defun ediff-position-region (beg end pos job-name)
(if (> end (point-max))
(setq end (point-max)))
(defun ediff-next-difference (&optional arg)
- "Advance to the next difference.
+ "Advance to the next difference.
With a prefix argument, go forward that many differences."
(interactive "p")
(ediff-barf-if-not-control-buffer)
(let ((n (min ediff-number-of-differences
(+ ediff-current-difference (or arg 1))))
non-clash-skip skip-changed regexp-skip)
-
+
(ediff-visible-region)
(or (>= n ediff-number-of-differences)
(setq regexp-skip (funcall ediff-skip-diff-region-function n))
;; this won't exec if regexp-skip is t
(setq non-clash-skip (ediff-merge-region-is-non-clash n)
- skip-changed
+ skip-changed
(ediff-skip-merge-region-if-changed-from-default-p n))
(ediff-install-fine-diff-if-necessary n))
;; Skip loop
(error "At end of the difference list")))
(defun ediff-previous-difference (&optional arg)
- "Go to the previous difference.
+ "Go to the previous difference.
With a prefix argument, go back that many differences."
(interactive "p")
(ediff-barf-if-not-control-buffer)
(if (> ediff-current-difference -1)
(let ((n (max -1 (- ediff-current-difference (or arg 1))))
non-clash-skip skip-changed regexp-skip)
-
+
(ediff-visible-region)
(or (< n 0)
(setq regexp-skip (funcall ediff-skip-diff-region-function n))
;; this won't exec if regexp-skip is t
(setq non-clash-skip (ediff-merge-region-is-non-clash n)
- skip-changed
+ skip-changed
(ediff-skip-merge-region-if-changed-from-default-p n))
(ediff-install-fine-diff-if-necessary n))
(while (and (> n -1)
(ediff-unselect-and-select-difference difference-number)
(error ediff-BAD-DIFF-NUMBER
this-command (1+ difference-number) ediff-number-of-differences)))
-
+
(defun ediff-jump-to-difference-at-point (arg)
"Go to difference closest to the point in buffer A, B, or C.
The buffer depends on last command character \(a, b, or c\) that invoked this
(select-window ctl-wind)
))
))
-
-
+
+
;; find region most related to the current point position (or POS, if given)
;; returns diff number as seen by the user (i.e., 1+ the internal
-;; representation)
+;; representation)
;; The optional argument WHICH-DIFF can be `after' or `before'. If `after',
;; find the diff after the point. If `before', find the diff before the
;; point. If the point is inside a diff, return that diff.
(prev-end 0)
(beg 0)
(end 0))
-
+
(ediff-with-current-buffer buffer
(setq pos (or pos (point)))
(while (and (or (< pos prev-beg) (> pos beg))
(setq beg (ediff-get-diff-posn buf-type 'beg diff-no ctl-buffer)
end (ediff-get-diff-posn buf-type 'end diff-no ctl-buffer))
)
-
+
;; boost diff-no by 1, if past the last diff region
(if (and (memq which-diff '(after before))
(> pos beg) (= diff-no max-dif-num))
messg
ediff-verbose-p
reg-to-delete reg-to-delete-beg reg-to-delete-end)
-
+
(setq reg-to-delete-beg
(ediff-get-diff-posn to-buf-type 'beg n ctrl-buf))
(setq reg-to-delete-end
(ediff-get-diff-posn to-buf-type 'end n ctrl-buf))
-
+
(if reg-to-copy
(setq from-buf-type nil)
(setq reg-to-copy (ediff-get-region-contents n from-buf-type ctrl-buf)))
-
+
(setq reg-to-delete (ediff-get-region-contents
n to-buf-type ctrl-buf
reg-to-delete-beg reg-to-delete-end))
-
+
(if (string= reg-to-delete reg-to-copy)
(setq saved-p nil) ; don't copy identical buffers
;; seems ok to copy
(ediff-with-current-buffer to-buf
;; to prevent flags from interfering if buffer is writable
(let ((inhibit-read-only (null buffer-read-only)))
-
+
(goto-char reg-to-delete-end)
(insert reg-to-copy)
-
+
(if (> reg-to-delete-end reg-to-delete-beg)
(kill-region reg-to-delete-beg reg-to-delete-end))
))
(or batch-invocation
- (setq
+ (setq
messg
(ediff-save-diff-region n to-buf-type reg-to-delete))))
(error (message "ediff-copy-diff: %s %s"
(setq saved-p nil)
)))
)
-
+
;; adjust state of difference in case 3-way and diff was copied ok
(if (and saved-p three-way)
(ediff-set-state-of-diff-in-all-buffers n ctrl-buf))
;; before reinserting flags (and thus before ediff-recenter).
(if (and saved-p three-way)
(ediff-clear-fine-differences n))
-
+
(ediff-refresh-mode-lines)
-
+
;; For diff2 jobs, don't recompute fine diffs, since we know there
;; aren't any. So we clear diffs after ediff-recenter.
(if (and saved-p (not three-way))
;; by the user
(message messg))
))
-
+
;; Save Nth diff of buffer BUF-TYPE \(A, B, or C\).
;; That is to say, the Nth diff on the `ediff-killed-diffs-alist'. REG
;; is the region to save. It is redundant here, but is passed anyway, for
(let* ((n-th-diff-saved (assoc n ediff-killed-diffs-alist))
(buf (ediff-get-buffer buf-type))
(this-buf-n-th-diff-saved (assoc buf (cdr n-th-diff-saved))))
-
+
(if this-buf-n-th-diff-saved
;; either nothing saved for n-th diff and buffer or we OK'ed
;; overriding
(if ediff-merge-job
"" (downcase (symbol-name buf-type))))
))
-
+
;; Test if saving Nth difference region of buffer BUF-TYPE is possible.
(defun ediff-test-save-region (n buf-type)
(let* ((n-th-diff-saved (assoc n ediff-killed-diffs-alist))
(buf (ediff-get-buffer buf-type))
(this-buf-n-th-diff-saved (assoc buf (cdr n-th-diff-saved))))
-
+
(if this-buf-n-th-diff-saved
(if (yes-or-no-p
- (format
+ (format
"You've previously copied diff region %d to buffer %S. Confirm "
(1+ n) buf-type))
t
(error "Quit"))
t)))
-
+
(defun ediff-pop-diff (n buf-type)
"Pop last killed Nth diff region from buffer BUF-TYPE."
(let* ((n-th-record (assoc n ediff-killed-diffs-alist))
(ctl-buf ediff-control-buffer)
ediff-verbose-p
saved-diff reg-beg reg-end recovered)
-
+
(if (cdr saved-rec)
(setq saved-diff (cdr saved-rec))
(if (> ediff-number-of-differences 0)
(error "Nothing saved for diff %d in buffer %S" (1+ n) buf-type)
(error ediff-NO-DIFFERENCES)))
-
+
(setq reg-beg (ediff-get-diff-posn buf-type 'beg n ediff-control-buffer))
(setq reg-end (ediff-get-diff-posn buf-type 'end n ediff-control-buffer))
-
+
(condition-case conds
(ediff-with-current-buffer buf
(let ((inhibit-read-only (null buffer-read-only)))
-
+
(goto-char reg-end)
(insert saved-diff)
-
+
(if (> reg-end reg-beg)
(kill-region reg-beg reg-end))
-
+
(setq recovered t)
))
(error (message "ediff-pop-diff: %s %s"
(car conds)
(mapconcat 'prin1-to-string (cdr conds) " "))
(beep 1)))
-
+
;; Clearing fine diffs is necessary for
;; ediff-unselect-and-select-difference to properly recompute them. We
;; can't rely on ediff-copy-diff to clear this vector, as the user might
;; fine diffs.
(if recovered
(ediff-clear-fine-differences n))
-
+
;; adjust state of difference
(if (and three-way recovered)
(ediff-set-state-of-diff-in-all-buffers n ctl-buf))
-
+
(ediff-refresh-mode-lines)
-
+
(if recovered
(progn
(setq n-th-record (delq saved-rec n-th-record))
(message "Diff region %d in buffer %S restored" (1+ n) buf-type)
))
))
-
+
(defun ediff-restore-diff (arg &optional key)
"Restore ARGth diff from `ediff-killed-diffs-alist'.
ARG is a prefix argument. If ARG is nil, restore the current-difference.
(ediff-barf-if-not-control-buffer)
(if (numberp arg)
(ediff-jump-to-difference arg))
- (ediff-pop-diff ediff-current-difference
+ (ediff-pop-diff ediff-current-difference
(ediff-char-to-buftype (or key last-command-char)))
;; recenter with rehighlighting, but no messages
(let (ediff-verbose-p)
ARG is a prefix argument. If nil, restore the current diff."
(interactive "P")
(ediff-restore-diff arg ?c))
-
-
+
+
(defun ediff-toggle-regexp-match ()
"Toggle between focusing and hiding of difference regions that match
a regular expression typed in by the user."
(setq ediff-skip-diff-region-function 'ediff-show-all-diffs))
((eq last-command-char ?h)
(setq ediff-skip-diff-region-function ediff-hide-regexp-matches-function
- regexp-A
+ regexp-A
(read-string
- (format
+ (format
"Ignore A-regions matching this regexp (default \"%s\"): "
ediff-regexp-hide-A))
regexp-B
(read-string
- (format
+ (format
"Ignore B-regions matching this regexp (default \"%s\"): "
ediff-regexp-hide-B)))
(if ediff-3way-comparison-job
(setq regexp-C
(read-string
- (format
+ (format
"Ignore C-regions matching this regexp (default \"%s\"): "
ediff-regexp-hide-C))))
(if (eq ediff-hide-regexp-connective 'and)
(message "Will ignore regions that match %s regexps" msg-connective)
(setq ediff-hide-regexp-connective alt-connective)
(message "Will ignore regions that match %s regexps"
- alt-msg-connective))
+ alt-msg-connective))
(or (string= regexp-A "") (setq ediff-regexp-hide-A regexp-A))
(or (string= regexp-B "") (setq ediff-regexp-hide-B regexp-B))
((eq last-command-char ?f)
(setq ediff-skip-diff-region-function
ediff-focus-on-regexp-matches-function
- regexp-A
+ regexp-A
(read-string
- (format
+ (format
"Focus on A-regions matching this regexp (default \"%s\"): "
ediff-regexp-focus-A))
regexp-B
(read-string
- (format
+ (format
"Focus on B-regions matching this regexp (default \"%s\"): "
ediff-regexp-focus-B)))
(if ediff-3way-comparison-job
(setq regexp-C
(read-string
- (format
+ (format
"Focus on C-regions matching this regexp (default \"%s\"): "
ediff-regexp-focus-C))))
(if (eq ediff-focus-regexp-connective 'and)
(message "Will focus on regions that match %s regexps"
msg-connective)
(setq ediff-focus-regexp-connective alt-connective)
- (message "Will focus on regions that match %s regexps"
+ (message "Will focus on regions that match %s regexps"
alt-msg-connective))
(or (string= regexp-A "") (setq ediff-regexp-focus-A regexp-A))
(or (string= regexp-B "") (setq ediff-regexp-focus-B regexp-B))
(or (string= regexp-C "") (setq ediff-regexp-focus-C regexp-C))))))
-
+
(defun ediff-toggle-skip-similar ()
(interactive)
(ediff-barf-if-not-control-buffer)
(message
"Skipping regions that differ only in white space & line breaks")
(message "Skipping over white-space differences turned off")))
-
+
(defun ediff-focus-on-regexp-matches (n)
"Focus on diffs that match regexp `ediff-regexp-focus-A/B'.
-Regions to be ignored according to this function are those where
+Regions to be ignored according to this function are those where
buf A region doesn't match `ediff-regexp-focus-A' and buf B region
doesn't match `ediff-regexp-focus-B'.
This function returns nil if the region number N (specified as
(list ediff-focus-regexp-connective
reg-A-match reg-B-match))))
)))
-
-(defun ediff-hide-regexp-matches (n)
+
+(defun ediff-hide-regexp-matches (n)
"Hide diffs that match regexp `ediff-regexp-hide-A/B/C'.
Regions to be ignored are those where buf A region matches
`ediff-regexp-hide-A' and buf B region matches `ediff-regexp-hide-B'.
reg-A-match reg-B-match reg-C-match)
(list ediff-hide-regexp-connective reg-A-match reg-B-match)))
)))
-
+
\f
;;; Quitting, suspending, etc.
\(but not buffers A, B, C\).
If `ediff-keep-variants' is nil, the user will be asked whether the buffers
-containing the variants should be removed \(if they haven't been modified\).
-If it is t, they will be preserved unconditionally. A prefix argument,
+containing the variants should be removed \(if they haven't been modified\).
+If it is t, they will be preserved unconditionally. A prefix argument,
temporarily reverses the meaning of this variable."
(interactive "P")
(ediff-barf-if-not-control-buffer)
(ediff-clear-diff-vector 'ediff-difference-vector-Ancestor 'fine-diffs-also)
(ediff-delete-temp-files)
-
+
;; Restore the visibility range. This affects only ediff-*-regions/windows.
;; Since for other job names ediff-visible-region sets
;; ediff-visible-bounds to ediff-wide-bounds, the settings below are
(if ediff-quit-widened
(setq ediff-visible-bounds ediff-wide-bounds)
(setq ediff-visible-bounds ediff-narrow-bounds))
-
+
;; Apply selective display to narrow or widen
(ediff-visible-region)
(mapcar (lambda (overl)
(session-number ediff-meta-session-number)
;; suitable working frame
(warp-frame (if (and (ediff-window-display-p) (eq ediff-grab-mouse t))
- (cond ((window-live-p ediff-window-A)
+ (cond ((window-live-p ediff-window-A)
(window-frame ediff-window-A))
- ((window-live-p ediff-window-B)
+ ((window-live-p ediff-window-B)
(window-frame ediff-window-B))
(t (next-frame))))))
(condition-case nil
(ediff-with-current-buffer ediff-buffer-A
- (setq ediff-this-buffer-ediff-sessions
+ (setq ediff-this-buffer-ediff-sessions
(delq control-buffer ediff-this-buffer-ediff-sessions))
(kill-local-variable 'mode-line-buffer-identification)
(kill-local-variable 'mode-line-format)
)
(error))
-
+
(condition-case nil
(ediff-with-current-buffer ediff-buffer-B
- (setq ediff-this-buffer-ediff-sessions
+ (setq ediff-this-buffer-ediff-sessions
(delq control-buffer ediff-this-buffer-ediff-sessions))
(kill-local-variable 'mode-line-buffer-identification)
(kill-local-variable 'mode-line-format)
)
(error))
-
+
(condition-case nil
(ediff-with-current-buffer ediff-buffer-C
- (setq ediff-this-buffer-ediff-sessions
+ (setq ediff-this-buffer-ediff-sessions
(delq control-buffer ediff-this-buffer-ediff-sessions))
(kill-local-variable 'mode-line-buffer-identification)
(kill-local-variable 'mode-line-format)
(condition-case nil
(ediff-with-current-buffer ediff-ancestor-buffer
- (setq ediff-this-buffer-ediff-sessions
+ (setq ediff-this-buffer-ediff-sessions
(delq control-buffer ediff-this-buffer-ediff-sessions))
(kill-local-variable 'mode-line-buffer-identification)
(kill-local-variable 'mode-line-format)
(if (string-match "Minibuf" buf-name)
nil
frame)))
-
-
+
+
(defun ediff-delete-temp-files ()
(if (and (stringp ediff-temp-file-A) (file-exists-p ediff-temp-file-A))
(delete-file ediff-temp-file-A))
(delete-file ediff-temp-file-B))
(if (and (stringp ediff-temp-file-C) (file-exists-p ediff-temp-file-C))
(delete-file ediff-temp-file-C)))
-
+
;; Kill control buffer, other auxiliary Ediff buffers.
;; Leave one of the frames split between buffers A/B/C
(ctl-wind (ediff-get-visible-buffer-window ctl-buf))
(ctl-frame ediff-control-frame)
(three-way-job ediff-3way-job)
- (main-frame (cond ((window-live-p ediff-window-A)
+ (main-frame (cond ((window-live-p ediff-window-A)
(window-frame ediff-window-A))
- ((window-live-p ediff-window-B)
+ ((window-live-p ediff-window-B)
(window-frame ediff-window-B)))))
-
+
(ediff-kill-buffer-carefully ediff-diff-buffer)
(ediff-kill-buffer-carefully ediff-custom-diff-buffer)
(ediff-kill-buffer-carefully ediff-fine-diff-buffer)
(ediff-kill-bottom-toolbar))
(ediff-kill-buffer-carefully ctl-buf)
-
+
(if (frame-live-p main-frame)
(select-frame main-frame))
-
+
;; display only if not visible
(condition-case nil
(or (ediff-get-visible-buffer-window buff-B)
;; Kill indirect buffer even if it is modified, because the base buffer
;; is still there. Note that if the base buffer is dead then so will be
;; the indirect buffer
- (ediff-with-current-buffer buff
+ (ediff-with-current-buffer buff
(set-buffer-modified-p nil))
(ediff-kill-buffer-carefully buff)
(ediff-with-current-buffer base
(buf-diff ediff-diff-buffer)
(buf-custom-diff ediff-custom-diff-buffer)
(buf-fine-diff ediff-fine-diff-buffer))
-
+
;; hide the control panel
(if (and (ediff-window-display-p) (frame-live-p ediff-control-frame))
(iconify-frame ediff-control-frame)
- (bury-buffer))
+ (bury-buffer))
(if buf-err (bury-buffer buf-err))
(if buf-diff (bury-buffer buf-diff))
(if buf-custom-diff (bury-buffer buf-custom-diff))
(bury-buffer))))
))
-
+
(defun ediff-suspend ()
"Suspend Ediff.
To resume, switch to the appropriate `Ediff Control Panel'
(if buffer-file-name
(princ
(format "File A = %S\n" buffer-file-name))
- (princ
+ (princ
(format "Buffer A = %S\n" (buffer-name)))))
(ediff-with-current-buffer ediff-buffer-B
(if buffer-file-name
(princ
(format "File B = %S\n" buffer-file-name))
- (princ
+ (princ
(format "Buffer B = %S\n" (buffer-name)))))
(if ediff-3way-job
(ediff-with-current-buffer ediff-buffer-C
(if buffer-file-name
(princ
(format "File C = %S\n" buffer-file-name))
- (princ
+ (princ
(format "Buffer C = %S\n" (buffer-name))))))
(princ (format "Customized diff output %s\n"
(if (ediff-buffer-live-p ediff-custom-diff-buffer)
(concat "\tin buffer "
(buffer-name ediff-diff-buffer))
" is not available")))
-
+
(let* ((A-line (ediff-with-current-buffer ediff-buffer-A
(1+ (count-lines (point-min) (point)))))
(B-line (ediff-with-current-buffer ediff-buffer-B
(setq C-line (ediff-with-current-buffer ediff-buffer-C
(1+ (count-lines (point-min) (point)))))
(princ (format "Buffer C's point is on line %d\n" C-line)))))
-
+
(princ (format "\nCurrent difference number = %S\n"
(cond ((< ediff-current-difference 0) 'start)
((>= ediff-current-difference
(if (and ediff-skip-merge-regions-that-differ-from-default ediff-merge-job)
(princ
"\nSkipping merge regions that differ from default setting"))
-
+
(cond ((eq ediff-skip-diff-region-function 'ediff-show-all-diffs)
(princ "\nSelective browsing by regexp is off\n"))
((eq ediff-skip-diff-region-function
(princ
"\nIgnoring regions that match")
(princ
- (format
+ (format
"\n\t regexp `%s' in buffer A %S\n\t regexp `%s' in buffer B\n"
ediff-regexp-hide-A ediff-hide-regexp-connective
ediff-regexp-hide-B)))
ediff-regexp-focus-A ediff-focus-regexp-connective
ediff-regexp-focus-B)))
(t (princ "\nSelective browsing via a user-defined method.\n")))
-
+
(princ
(format "\nBugs/suggestions: type `%s' while in Ediff Control Panel."
(substitute-command-keys "\\[ediff-submit-report]")))
(ediff-reset-mouse ediff-control-frame))
(if (window-live-p ediff-control-window)
(select-window ediff-control-window)))
-
+
\f
(ediff-place-flags-in-buffer
'Ancestor ediff-ancestor-buffer
ediff-control-buffer n))
- ))
-
+ ))
+
(ediff-install-fine-diff-if-necessary n)
(run-hooks 'ediff-select-hook))))
-
+
;; Unselect a difference by removing the ASCII flags in the buffers.
;; This may have to be modified for buffer C, when it will be supported.
(defun ediff-unselect-difference (n)
(if (ediff-valid-difference-p n)
- (progn
+ (progn
(cond ((and (ediff-has-face-support-p) ediff-use-faces)
(ediff-unhighlight-diff))
((eq ediff-highlighting-style 'ascii)
ediff-ancestor-buffer
(ediff-get-diff-overlay n 'Ancestor)))
))
-
+
;; unhighlight fine diffs
(ediff-set-fine-diff-properties ediff-current-difference 'default)
(run-hooks 'ediff-unselect-hook))))
-
+
;; Unselects prev diff and selects a new one, if FLAG has value other than
;; 'select-only or 'unselect-only. If FLAG is 'select-only, the
(let ((ediff-current-difference n))
(or no-recenter
(ediff-recenter 'no-rehighlight)))
-
+
(let ((control-buf ediff-control-buffer))
- (unwind-protect
+ (unwind-protect
(progn
(or (eq flag 'select-only)
(ediff-unselect-difference ediff-current-difference))
-
+
(or (eq flag 'unselect-only)
(ediff-select-difference n))
(setq ediff-current-difference n)
) ; end protected section
-
+
(ediff-with-current-buffer control-buf (ediff-refresh-mode-lines)))
))
(file-name-nondirectory default-file) f)))
(if (and no-dirs (file-directory-p f))
(error "File %s is a directory" f))
- f))
-
+ f))
+
;; If PREFIX is given, then it is used as a prefix for the temp file
;; name. Otherwise, `ediff' is used. If FILE is given, use this
;; file and don't create a new one.
(not (msdos-long-file-names))
(> (length p) 2))
(setq short-p (substring p 0 2)))
-
+
(setq f (concat ediff-temp-file-prefix p)
short-f (concat ediff-temp-file-prefix short-p)
f (cond (given-file)
;; This is needed so that patches produced by ediff will
;; have more meaningful names
(ediff-make-empty-tmp-file short-f))
- (prefix
+ (prefix
;; Prefix is most often the same as the file name for the
;; variant. Here we are trying to use the original file
;; name but in the temp directory.
;; If don't care about name, add some random stuff
;; to proposed file name.
(ediff-make-empty-tmp-file short-f))))
-
+
;; create the file
(ediff-with-current-buffer buff
(write-region (if start start (point-min))
(if end end (point-max))
f
nil ; don't append---erase
- 'no-message)
+ 'no-message)
(set-file-modes f ediff-temp-file-mode)
(expand-file-name f))))
(if (verify-visited-file-modtime (current-buffer))
(if (buffer-modified-p)
;; If buffer is not obsolete and is modified, offer to save
- (if (yes-or-no-p
+ (if (yes-or-no-p
(format "Buffer %s has been modified. Save it in file %s? "
(buffer-name)
buffer-file-name))
(set-mark reg-end)
(setq ediff-temp-indirect-buffer t))
cloned-buff))
-
+
(defun ediff-make-cloned-buffer (buff region-name)
(setq buf-B-file-name (file-name-nondirectory buf-B-file-name)))
(setq file-A (ediff-make-temp-file ediff-buffer-A buf-A-file-name)
file-B (ediff-make-temp-file ediff-buffer-B buf-B-file-name))
-
+
(or (ediff-buffer-live-p ediff-custom-diff-buffer)
(setq ediff-custom-diff-buffer
(get-buffer-create
nil)
((equal answer ""))
(t (beep 1)
- (message
+ (message
"Valid values are %s"
(mapconcat 'char-to-string possibilities " or "))
(sit-for 2)
nil)
((equal answer ""))
(t (beep 1)
- (message
+ (message
"Valid values are %s"
(mapconcat 'char-to-string possibilities " or "))
(sit-for 2)
;; setup param to pass to ediff-setup
(list (cons 'ediff-split-window-function ediff-split-window-function)))
))
-
-
+
+
(defun ediff-remove-flags-from-buffer (buffer overlay)
(ediff-with-current-buffer buffer
(if ediff-xemacs-p
(ediff-overlay-put overlay 'begin-glyph nil)
(ediff-overlay-put overlay 'before-string nil))
-
+
(if ediff-xemacs-p
(ediff-overlay-put overlay 'end-glyph nil)
(ediff-overlay-put overlay 'after-string nil))
(ediff-get-diff-overlay diff-no buf-type)))
(before (ediff-get-diff-posn buf-type 'beg diff-no ctl-buffer))
after beg-of-line flag)
-
+
;; insert flag before the difference
(goto-char before)
(setq beg-of-line (bolp))
-
+
(setq flag (ediff-with-current-buffer ctl-buffer
(if (eq ediff-highlighting-style 'ascii)
(if beg-of-line
ediff-before-flag-bol ediff-before-flag-mol))))
-
+
;; insert the flag itself
(if ediff-xemacs-p
(ediff-overlay-put curr-overl 'begin-glyph flag)
(ediff-overlay-put curr-overl 'before-string flag))
-
+
;; insert the flag after the difference
;; `after' must be set here, after the before-flag was inserted
(setq after (ediff-get-diff-posn buf-type 'end diff-no ctl-buffer))
(goto-char after)
(setq beg-of-line (bolp))
-
+
(setq flag (ediff-with-current-buffer ctl-buffer
(if (eq ediff-highlighting-style 'ascii)
(if beg-of-line
ediff-after-flag-eol ediff-after-flag-mol))))
-
+
;; insert the flag itself
(if ediff-xemacs-p
(ediff-overlay-put curr-overl 'end-glyph flag)
(buffer-substring
(or start (ediff-get-diff-posn buf-type 'beg n ctrl-buf))
(or end (ediff-get-diff-posn buf-type 'end n ctrl-buf)))))
-
+
;; Returns positions of difference sectors in the BUF-TYPE buffer.
-;; BUF-TYPE should be a symbol -- `A', `B', or `C'.
+;; BUF-TYPE should be a symbol -- `A', `B', or `C'.
;; POS is either `beg' or `end'--it specifies whether you want the position at
;; the beginning of a difference or at the end.
-;;
+;;
;; The optional argument N says which difference (default:
;; `ediff-current-difference'). N is the internal difference number (1- what
;; the user sees). The optional argument CONTROL-BUF says
;; ediff-highlighting-style, and ediff-highlight-all-diffs variables.
(defun ediff-restore-highlighting (&optional ctl-buf)
(ediff-with-current-buffer (or ctl-buf (current-buffer))
- (if (and (ediff-has-face-support-p)
+ (if (and (ediff-has-face-support-p)
ediff-use-faces
ediff-highlight-all-diffs)
(ediff-paint-background-regions))
(ediff-select-difference ediff-current-difference)))
-
+
;; null out difference overlays so they won't slow down future
;; editing operations
;; VEC is either a difference vector or a fine-diff vector
(defun ediff-clear-diff-vector (vec-var &optional fine-diffs-also)
(if (vectorp (symbol-value vec-var))
(mapcar (lambda (elt)
- (ediff-delete-overlay
+ (ediff-delete-overlay
(ediff-get-diff-overlay-from-diff-record elt))
(if fine-diffs-also
(ediff-clear-fine-diff-vector elt))
;; allow them to be garbage collected
(set vec-var nil))
-
+
\f
;;; Misc
(setq beg (eval beg)))
(or (number-or-marker-p end)
(setq end (eval end)))
- (setq overl
+ (setq overl
(ediff-cond-compile-for-xemacs-or-emacs
(make-extent beg end buff) ; xemacs
;; advance front and rear of the overlay
(make-overlay beg end buff nil 'rear-advance) ; emacs
))
-
+
;; never detach
(ediff-overlay-put
overl (if ediff-emacs-p 'evaporate 'detachable) nil)
;; In emacs, it is made open ended at creation time
(if ediff-xemacs-p
(progn
- (ediff-overlay-put overl 'start-open nil)
+ (ediff-overlay-put overl 'start-open nil)
(ediff-overlay-put overl 'end-open nil)))
(ediff-overlay-put overl 'ediff-diff-num 0)
overl))))
(ediff-set-overlay-face (symbol-value overlay) face)
(ediff-overlay-put (symbol-value overlay) 'ediff ediff-control-buffer))
))
-
-
+
+
;; Like other-buffer, but prefers visible buffers and ignores temporary or
;; other insignificant buffers (those beginning with "^[ *]").
;; Gets one arg--buffer name or a list of buffer names (it won't return
;; these buffers).
-;; EXCL-BUFF-LIST is an exclusion list.
+;; EXCL-BUFF-LIST is an exclusion list.
(defun ediff-other-buffer (excl-buff-lst)
(or (listp excl-buff-lst) (setq excl-buff-lst (list excl-buff-lst)))
(let* ((all-buffers (nconc (ediff-get-selected-buffers) (buffer-list)))
(selected-buffers (ediff-get-selected-buffers))
(prefered-buffer (car all-buffers))
visible-dired-buffers
- (excl-buff-name-list
- (mapcar
+ (excl-buff-name-list
+ (mapcar
(lambda (b) (cond ((stringp b) b)
((bufferp b) (buffer-name b))))
excl-buff-lst))
(clean-significant-buffers (delq nil significant-buffers))
less-significant-buffers)
- (if (and (null clean-significant-buffers)
+ (if (and (null clean-significant-buffers)
(> (length visible-dired-buffers) 0))
(setq clean-significant-buffers visible-dired-buffers))
-
+
(cond (clean-significant-buffers (car clean-significant-buffers))
;; try also buffers that are not displayed in windows
((setq less-significant-buffers
(car less-significant-buffers))
(t "*scratch*"))
))
-
+
;; If current buffer is a Buffer-menu buffer, then take the selected buffers
;; and append the buffer at the cursor to the end.
(setq lis (cons (Buffer-menu-buffer t) lis)))
lis))
))
-
+
;; Construct a unique buffer name.
-;; The first one tried is prefixsuffix, then prefix<2>suffix,
+;; The first one tried is prefixsuffix, then prefix<2>suffix,
;; prefix<3>suffix, etc.
(defun ediff-unique-buffer-name (prefix suffix)
(if (null (get-buffer (concat prefix suffix)))
(while (get-buffer (format "%s<%d>%s" prefix n suffix))
(setq n (1+ n)))
(format "%s<%d>%s" prefix n suffix))))
-
+
(defun ediff-submit-report ()
"Submit bug report on Ediff."
(setq varlist '(ediff-diff-program ediff-diff-options
ediff-patch-program ediff-patch-options
ediff-shell
- ediff-use-faces
+ ediff-use-faces
ediff-auto-refine ediff-highlighting-style
ediff-buffer-A ediff-buffer-B ediff-control-buffer
ediff-forward-word-function
and mail it to the address above.
-----------------------------------------------------------
")
-
+
(ediff-skip-unsuitable-frames)
(ediff-reset-mouse)
-
+
(switch-to-buffer ediff-msg-buffer)
(erase-buffer)
(delete-other-windows)
** reference to free variable pm-color-alist
........................
While compiling the end of the data:
- ** The following functions are not known to be defined:
+ ** The following functions are not known to be defined:
ediff-valid-color-p, ediff-set-face,
........................
suggestions are always welcome.
Mail anyway? (y or n) ")
-
+
(if (y-or-n-p "Mail anyway? ")
(progn
(if (ediff-buffer-live-p ctl-buf)
(reporter-submit-bug-report "kifer@cs.stonybrook.edu"
(ediff-version)
varlist
- nil
+ nil
'delete-other-windows
salutation))
(bury-buffer)
(defun ediff-choose-syntax-table ()
(setq ediff-syntax-table
(ediff-with-current-buffer ediff-buffer-A
- (if (not (memq major-mode
+ (if (not (memq major-mode
'(fundamental-mode text-mode indented-text-mode)))
(syntax-table))))
(if (not ediff-syntax-table)
- (setq ediff-syntax-table
+ (setq ediff-syntax-table
(ediff-with-current-buffer ediff-buffer-B
(syntax-table))))
)
-
+
(defun ediff-deactivate-mark ()
(ediff-cond-compile-for-xemacs-or-emacs
(zmacs-deactivate-region) ; xemacs
(setq selective-display nil)))))
))
-
+
;; The next two are modified versions from emerge.el.
;; VARS must be a list of symbols
;; ediff-save-variables returns an association list: ((var . val) ...)
(assoc-elt (assoc var assoc-list)))
(if assoc-elt
(setcdr assoc-elt value))))
-
-
+
+
;; must execute in control buf
(defun ediff-save-protected-variables ()
(setq ediff-buffer-values-orig-A
(defsubst ediff-save-time ()
(setq ediff-command-begin-time (current-time)))
-
+
(defun ediff-profile ()
"Toggle profiling Ediff commands."
(interactive)
(add-hook pre-hook 'ediff-save-time t 'local)
(add-hook post-hook 'ediff-calc-command-time nil 'local)
(message "Ediff profiling enabled"))))
-
+
(defun ediff-print-diff-vector (diff-vector-var)
(princ (format "\n*** %S ***\n" diff-vector-var))
(mapcar (lambda (overl-vec)
\t\tNo-fine-diff-flag: %S
\t\tState-of-diff:\t %S
\t\tState-of-merge:\t %S
-"
+"
(1+ (ediff-overlay-get (aref overl-vec 0) 'ediff-diff-num))
(aref overl-vec 0)
;; fine-diff-vector
)))
(eval diff-vector-var)))
-
+
(defun ediff-debug-info ()
(interactive)
(nconc result (list (car lis1))))
(setq lis1 (cdr lis1)))
(cdr result)))
-
+
;; eliminates duplicates using comparison-func
(defun ediff-union (lis1 lis2 comparison-func)
;;(ediff-load-version-control 'silent)
(run-hooks 'ediff-load-hook)
-
+
;;; Local Variables:
;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
HCoop / bpt / emacs.git / blobdiff