xemacs-beta: lisp/ediff/ediff-util.el comparison

comparison lisp/ediff/ediff-util.el @ 80:1ce6082ce73f r20-0b90

Import from CVS: tag r20-0b90

author	cvs
date	Mon, 13 Aug 2007 09:06:37 +0200
parents	c7528f8e288d
children	6a378aca36af

comparison

equal deleted inserted replaced

-:5b0a5bbffab6
+:1ce6082ce73f
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 ;;; Code:
-;; Pacify compiler and avoid the need in checking for boundp
+(provide 'ediff-util)
-(defvar ediff-patch-diagnostics nil)
-(defvar ediff-patchbufer nil)
+;; Compiler pacifier
-(and noninteractive
+(defvar ediff-patch-diagnostics)
-(eval-when-compile
+(defvar ediff-patchbufer)
-(let ((load-path (cons (expand-file-name ".") load-path)))
+(defvar ediff-toolbar)
-	 (load-file "ediff-init.el")
+(defvar mark-active)
-	 (load-file "ediff-help.el"))))
+(eval-when-compile
+(let ((load-path (cons "." load-path)))
+(or (featurep 'ediff-init)
+	(load "ediff-init.el" nil nil 'nosuffix))
+(or (featurep 'ediff-help)
+	(load "ediff-help.el" nil nil 'nosuffix))
+(or (featurep 'ediff-mult)
+	(load "ediff-mult.el" nil nil 'nosuffix))
+(or (featurep 'ediff-wind)
+	(load "ediff-wind.el" nil nil 'nosuffix))
+(or (featurep 'ediff-diff)
+	(load "ediff-diff.el" nil nil 'nosuffix))
+(or (featurep 'ediff-merg)
+	(load "ediff-merg.el" nil nil 'nosuffix))
+(or (featurep 'ediff)
+	(load "ediff.el" nil nil 'nosuffix))
+(or (featurep 'ediff-tbar)
+	(load "ediff-tbar.el" 'noerror nil 'nosuffix))
+))
 ;; end pacifier
 (require 'ediff-init)
 (require 'ediff-help)
 (require 'ediff-mult)
+(require 'ediff-wind)
-;;(if ediff-xemacs-p
+(require 'ediff-diff)
-;;    (require 'ediff-tbar)
+(require 'ediff-merg)
-;;  (defun ediff-use-toolbar-p () nil))
-;;
-;; for the time being
+;; be careful with ediff-tbar
-(defun ediff-use-toolbar-p () nil)
+(if ediff-xemacs-p
+(condition-case nil
+	(require 'ediff-tbar)
+(error
+(defun ediff-use-toolbar-p () nil)))
+(defun ediff-use-toolbar-p () nil))
 ;;; Functions
 (defun ediff-mode ()
 (setq major-mode 'ediff-mode)
 (setq mode-name "Ediff")
 (run-hooks 'ediff-mode-hook))
-(require 'ediff-diff)
-(require 'ediff-merg)
 ;;; Build keymaps
 (ediff-defvar-local ediff-mode-map nil
 "Local keymap used in Ediff mode.
 (fset 'ediff-mode-map ediff-mode-map)
 (run-hooks 'ediff-keymap-setup-hook))
 ;;; Setup functions
-(require 'ediff-wind)
 ;; No longer needed: XEmacs has surrogate minibuffers now.
 ;;(or (boundp 'synchronize-minibuffers)
 ;;    (defvar synchronize-minibuffers nil))
 (if (not (ediff-multiframe-setup-p))
 	(ediff-make-bottom-toolbar))    ; checks if toolbar is requested
 (goto-char (point-min))
 (skip-chars-forward ediff-whitespace)))
 ;;; Commands for working with Ediff
 (defun ediff-update-diffs ()
 		 (not (file-writable-p file)))
 	    (message "Warning: file %s is read-only"
 		     (ediff-abbreviate-file-name file) (beep 1)))
 	))))
 ;; checkout if visited file is checked in
 (defun ediff-maybe-checkout (buf)
 (let ((file (buffer-file-name buf))
 	(checkout-function (key-binding "\C-x\C-q")))
 (if (and (ediff-file-checked-in-p file)
 (funcall ediff-make-wide-display-function)
 ;;(sit-for (if ediff-xemacs-p 0.4 0))
 (ediff-eval-in-buffer ctl-buf
 	(setq ediff-window-B nil) ; force update of window config
 	(ediff-recenter 'no-rehighlight)))))
 ;;;###autoload
 (defun ediff-toggle-multiframe ()
 "Switch from the multiframe display to single-frame display and back.
 For a permanent change, set the variable `ediff-window-setup-function',
 which see."
 (interactive)
-(let (set-func)
+(let (set-func window-setup-func)
 (or (ediff-window-display-p)
-(error "%sEmacs is not running as a window application"
+	(error "%sEmacs is not running as a window application"
-	     (if ediff-emacs-p "" "X")))
+	       (if ediff-emacs-p "" "X")))
-(setq set-func (if (ediff-in-control-buffer-p) 'setq 'setq-default))
+;;(setq set-func (if (ediff-in-control-buffer-p) 'setq 'setq-default))
 (cond ((eq ediff-window-setup-function 'ediff-setup-windows-multiframe)
-	 (eval
+	 ;; (eval
-	  (list
+	 ;;  (list
-	   set-func
+	 ;;   set-func
-	   'ediff-window-setup-function ''ediff-setup-windows-plain)))
+	 ;;   'ediff-window-setup-function ''ediff-setup-windows-plain))
+	 (setq window-setup-func 'ediff-setup-windows-plain)
+	 )
 	((eq ediff-window-setup-function 'ediff-setup-windows-plain)
 	 (if (ediff-in-control-buffer-p)
 	     (ediff-kill-bottom-toolbar))
-	 (eval
+	 ;;(eval
-	  (list
+	 ;; (list
-	   set-func
+	 ;;  set-func
-	   'ediff-window-setup-function ''ediff-setup-windows-multiframe))))
+	 ;;  'ediff-window-setup-function 'ediff-setup-windows-multiframe))
+	 (setq window-setup-func 'ediff-setup-windows-multiframe)
+	 ))
+;; change default
+(setq-default ediff-window-setup-function window-setup-func)
+;; change in all active ediff sessions
+(mapcar (function (lambda(buf)
+		      (ediff-eval-in-buffer buf
+			(setq ediff-window-setup-function window-setup-func
+			      ediff-window-B nil))))
+	  ediff-session-registry)
 (if (ediff-in-control-buffer-p)
-(progn
+(ediff-recenter 'no-rehighlight))))
-	(setq ediff-window-B nil)
-	(ediff-recenter 'no-rehighlight)))))
 ;; if was using toolbar, kill it
 (defun ediff-kill-bottom-toolbar ()
 ;; Using ctl-buffer or ediff-control-window for LOCALE does not
 ;; work properly in XEmacs 19.14: we have to use
 	 (ediff-overlay-start overl-A) (ediff-overlay-end overl-A)))
 (ediff-eval-in-buffer ediff-buffer-B
 	(narrow-to-region
 	 (ediff-overlay-start overl-B) (ediff-overlay-end overl-B)))
-(if ediff-3way-comparison-job
+(if ediff-3way-job
 	  (ediff-eval-in-buffer ediff-buffer-C
 	    (narrow-to-region
 	     (ediff-overlay-start overl-C) (ediff-overlay-end overl-C))))
 )))
 (if (< ediff-current-difference ediff-number-of-differences)
 (let ((n (min ediff-number-of-differences
 		    (+ ediff-current-difference arg)))
 	    regexp-skip)
+	(ediff-visible-region)
 	(or (>= n ediff-number-of-differences)
 	    (setq regexp-skip (funcall ediff-skip-diff-region-function n))
 	    (ediff-install-fine-diff-if-necessary n))
 	(while (and (< n ediff-number-of-differences)
 		    (or
 (ediff-barf-if-not-control-buffer)
 (if (> ediff-current-difference -1)
 (let ((n (max -1 (- ediff-current-difference arg)))
 	    regexp-skip)
+	(ediff-visible-region)
 	(or (< n 0)
 	    (setq regexp-skip (funcall ediff-skip-diff-region-function n))
 	    (ediff-install-fine-diff-if-necessary n))
 	(while (and (> n -1)
 		    (or
 (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-buffer-carefully ediff-tmp-buffer)
 (ediff-kill-buffer-carefully ediff-error-buffer)
-(ediff-kill-buffer-carefully ediff-patch-diagnostics)
 (ediff-kill-buffer-carefully ediff-msg-buffer)
 (ediff-kill-buffer-carefully ediff-debug-buffer)
+(if (boundp 'ediff-patch-diagnostics)
+	(ediff-kill-buffer-carefully ediff-patch-diagnostics))
 (if (and (ediff-window-display-p) (frame-live-p ctl-frame))
 	(delete-frame ctl-frame))
 ;; Hide bottom toolbar.  --marcpa
 (if (not (ediff-multiframe-setup-p))
 	 (buf-B ediff-buffer-B)
 	 (buf-C ediff-buffer-C)
 	 (buf-A-wind (ediff-get-visible-buffer-window buf-A))
 	 (buf-B-wind (ediff-get-visible-buffer-window buf-B))
 	 (buf-C-wind (ediff-get-visible-buffer-window buf-C))
-	 (buf-patch  ediff-patchbufer)
+	 (buf-patch  (if (boundp 'ediff-patchbufer) ediff-patchbufer nil))
-	 (buf-patch-diag ediff-patch-diagnostics)
+	 (buf-patch-diag (if (boundp 'ediff-patch-diagnostics)
+			     ediff-patch-diagnostics nil))
 	 (buf-err  ediff-error-buffer)
 	 (buf-diff ediff-diff-buffer)
 	 (buf-custom-diff ediff-custom-diff-buffer)
 	 (buf-fine-diff ediff-fine-diff-buffer))
 (if (window-live-p buf-A-wind)
 	(progn
 	  (select-window buf-A-wind)
 	  (delete-other-windows)
 	  (bury-buffer))
-(if (ediff-buffer-live-p buf-A) (bury-buffer buf-A)))
+(if (ediff-buffer-live-p buf-A)
+	  (progn
+	    (set-buffer buf-A)
+	    (bury-buffer))))
 (if (window-live-p buf-B-wind)
 	(progn
 	  (select-window buf-B-wind)
 	  (delete-other-windows)
 	  (bury-buffer))
-(if (ediff-buffer-live-p buf-B) (bury-buffer buf-B)))
+(if (ediff-buffer-live-p buf-B)
+	  (progn
+	    (set-buffer buf-B)
+	    (bury-buffer))))
 (if (window-live-p buf-C-wind)
 	(progn
 	  (select-window buf-C-wind)
 	  (delete-other-windows)
 	  (bury-buffer))
-(if (ediff-buffer-live-p buf-C) (bury-buffer buf-C)))
+(if (ediff-buffer-live-p buf-C)
+	  (progn
+	    (set-buffer buf-C)
+	    (bury-buffer))))
 ))
 (defun ediff-suspend ()
 "Suspend Ediff.
 Ediff Control Panel to restore highlighting."
 (interactive)
 (let ((answer "")
 	(possibilities (list ?A ?B ?C))
 	(zmacs-regions t)
+	(ctl-buf (current-buffer))
 	quit-now
 	begA begB endA endB bufA bufB)
 (cond ((ediff-merge-job)
 	   (setq bufB ediff-buffer-C)
-	   (while (cond ((memq answer '(?A ?a))
+	   (while (cond ((eq answer ?A)
-			 (setq bufA ediff-buffer-A)
+			 (setq bufA ediff-buffer-A
+			       possibilities '(?B))
 			 nil)
-			((memq answer '(?B ?b))
+			((eq answer ?B)
-			 (setq bufA ediff-buffer-B)
+			 (setq bufA ediff-buffer-B
+			       possibilities '(?A))
 			 nil)
 			((equal answer ""))
 			(t (beep 1)
 			   (message "Valid values are A or B")
 			   (sit-for 2)
 			   t))
 	     (let ((cursor-in-echo-area t))
 	       (message "Which buffer to compare to the merge buffer (A/B)? ")
-	       (setq answer (read-char-exclusive)))))
+	       (setq answer (capitalize (read-char-exclusive))))))
 	  ((ediff-3way-comparison-job)
 	   (while (cond ((memq answer possibilities)
 			 (setq possibilities (delq answer possibilities))
 			 (setq bufA
 	       (message "Enter the 2nd buffer you want to compare (%s): "
 			(mapconcat 'char-to-string possibilities "/"))
 	       (setq answer (capitalize (read-char-exclusive))))))
 	  (t ; 2way comparison
 	   (setq bufA ediff-buffer-A
-		 bufB ediff-buffer-B)))
+		 bufB ediff-buffer-B
+		 possibilities nil)))
 (ediff-eval-in-buffer bufA
 (or (mark t)
 	  (error "You forgot to specify a region in buffer %s" (buffer-name)))
 (setq begA (region-beginning)
 (narrow-to-region begB endB)
 ;; (ediff-activate-mark)
 )
 ;; (sit-for 0)
+;; At this point, possibilities contains either the window char A/B/C
+;; that was not selected, or it is nil. We delete the window that is not
+;; selected.
+(if possibilities
+	(ediff-eval-in-buffer ctl-buf
+	  (let* ((wind-to-delete (eval
+				  (intern
+				   (format
+				    "ediff-window-%c" (car possibilities)))))
+		 (frame (window-frame wind-to-delete)))
+	    (delete-window wind-to-delete)
+	    (select-frame frame)
+	    (balance-windows))))
 (or (y-or-n-p
-	 "Please check the selected regions. Continue? ")
+	 "Please check regions selected for comparison. Continue? ")
 	(setq quit-now t))
 (ediff-eval-in-buffer bufA
 (widen))
 (ediff-eval-in-buffer bufB
 (widen))
 (if quit-now
-	(error "Thank you. Come back another day..."))
+	(ediff-eval-in-buffer ctl-buf
+	  (ediff-recenter)
+	  (sit-for 0)
+	  (error "All right. Make up your mind and come back...")))
 (ediff-regions-internal
 bufA begA endA bufB begB endB
 nil  			; startup hook
 'ediff-regions-linewise	; job name
 nil)			; no word mode
 ))
 (defun ediff-remove-flags-from-buffer (buffer overlay)
 (ediff-eval-in-buffer buffer
 (let ((inhibit-read-only t))
 (if ediff-xemacs-p
 		(ediff-overlay-put overl 'start-open nil)
 		(ediff-overlay-put overl 'end-open nil)))
 	  (ediff-overlay-put overl 'ediff-diff-num 0)
 	  overl))))
-(defsubst ediff-overlay-start (overl)
-(if (ediff-overlayp overl)
-(if ediff-emacs-p
-	  (overlay-start overl)
-	(extent-start-position overl))))
-(defsubst ediff-overlay-end  (overl)
-(if (ediff-overlayp overl)
-(if ediff-emacs-p
-	  (overlay-end overl)
-	(extent-end-position overl))))
 ;; 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).
 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
 ;;; eval: (put 'ediff-eval-in-buffer 'lisp-indent-hook 1)
 ;;; eval: (put 'ediff-eval-in-buffer 'edebug-form-spec '(form body))
 ;;; End:
-(provide 'ediff-util)
 ;;; ediff-util.el ends here

Mercurial > hg > xemacs-beta

comparison lisp/ediff/ediff-util.el @ 80:1ce6082ce73f r20-0b90