[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#19170: 25.0.50; enhancement request: `compare-windows' use across fr
From: |
Juri Linkov |
Subject: |
bug#19170: 25.0.50; enhancement request: `compare-windows' use across frames |
Date: |
Fri, 28 Nov 2014 23:15:38 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (x86_64-pc-linux-gnu) |
> You mean when the window referenced by `last-selected-window' is
> deleted? The one returned by (get-mru-window t t t) I presume. In any
> case `window-use-time' allows to order all windows by the time when they
> were selected.
Thank you, Martin. This is exactly what we need.
diff --git a/lisp/vc/compare-w.el b/lisp/vc/compare-w.el
index 25d4cf7..8e5cf11 100644
--- a/lisp/vc/compare-w.el
+++ b/lisp/vc/compare-w.el
@@ -140,9 +140,37 @@ out all highlighting later with the command
`compare-windows-dehighlight'."
(defvar compare-windows-overlays2 nil)
(defvar compare-windows-sync-point nil)
+(defcustom compare-windows-get-window-function
'compare-windows-get-recent-window
+ "Function that provides the window to compare with."
+ :type '(choice
+ (function-item :tag "Most recently used window"
+ compare-windows-get-recent-window)
+ (function-item :tag "Next window"
+ compare-windows-get-next-window)
+ (function :tag "Your function"))
+ :group 'compare-windows
+ :version "25.0")
+
+(defun compare-windows-get-recent-window ()
+ (let ((w2 (get-mru-window 'visible t t)))
+ (if (eq w2 (selected-window))
+ (error "No other window"))
+ w2))
+
+(defun compare-windows-get-next-window ()
+ (let ((w2 (next-window)))
+ (if (eq w2 (selected-window))
+ (setq w2 (next-window (selected-window) nil 'visible)))
+ (if (eq w2 (selected-window))
+ (error "No other window"))
+ w2))
+
;;;###autoload
(defun compare-windows (ignore-whitespace)
- "Compare text in current window with text in next window.
+ "Compare text in current window with text in another window.
+The option `compare-windows-get-window-function' defines how
+to get another window.
+
Compares the text starting at point in each window,
moving over text in each one as far as they match.
@@ -179,11 +207,7 @@ on third call it again advances points to the next
difference and so on."
'compare-windows-sync-regexp
compare-windows-sync)))
(setq p1 (point) b1 (current-buffer))
- (setq w2 (next-window))
- (if (eq w2 (selected-window))
- (setq w2 (next-window (selected-window) nil 'visible)))
- (if (eq w2 (selected-window))
- (error "No other window"))
+ (setq w2 (funcall compare-windows-get-window-function))
(setq p2 (window-point w2)
b2 (window-buffer w2))
(setq opoint2 p2)
@@ -255,12 +279,15 @@ on third call it again advances points to the next
difference and so on."
(recenter (car compare-windows-recenter))
(with-selected-window w2 (recenter (cadr
compare-windows-recenter))))
;; If points are still not synchronized, then ding
- (when (and (= p1 opoint1) (= p2 opoint2))
- ;; Display error message when current points in two windows
- ;; are unmatched and next matching points can't be found.
- (compare-windows-dehighlight)
- (ding)
- (message "No more matching points"))))))
+ (if (and (= p1 opoint1) (= p2 opoint2))
+ (progn
+ ;; Display error message when current points in two windows
+ ;; are unmatched and next matching points can't be found.
+ (compare-windows-dehighlight)
+ (ding)
+ (message "No more matching points with %s" b2))
+ (message "Match with %s" b2)))
+ (message "Difference with %s" b2))))
;; Move forward over whatever might be called whitespace.
;; compare-windows-whitespace is a regexp that matches whitespace.
@@ -303,7 +330,7 @@ on third call it again advances points to the next
difference and so on."
(defun compare-windows-sync-default-function ()
(if (not compare-windows-sync-point)
(let* ((w1 (selected-window))
- (w2 (next-window w1))
+ (w2 (funcall compare-windows-get-window-function))
(b2 (window-buffer w2))
(point-max2 (with-current-buffer b2 (point-max)))
(op2 (window-point w2))
- bug#19170: 25.0.50; enhancement request: `compare-windows' use across frames, (continued)
- bug#19170: 25.0.50; enhancement request: `compare-windows' use across frames, Drew Adams, 2014/11/24
- bug#19170: 25.0.50; enhancement request: `compare-windows' use across frames, Juri Linkov, 2014/11/25
- bug#19170: 25.0.50; enhancement request: `compare-windows' use across frames, Drew Adams, 2014/11/25
- bug#19170: 25.0.50; enhancement request: `compare-windows' use across frames, Juri Linkov, 2014/11/25
- bug#19170: 25.0.50; enhancement request: `compare-windows' use across frames, Drew Adams, 2014/11/25
- bug#19170: 25.0.50; enhancement request: `compare-windows' use across frames, Juri Linkov, 2014/11/26
- bug#19170: 25.0.50; enhancement request: `compare-windows' use across frames, Drew Adams, 2014/11/26
- bug#19170: 25.0.50; enhancement request: `compare-windows' use across frames, Juri Linkov, 2014/11/27
- bug#19170: 25.0.50; enhancement request: `compare-windows' use across frames, martin rudalics, 2014/11/28
- bug#19170: 25.0.50; enhancement request: `compare-windows' use across frames, Drew Adams, 2014/11/28
- bug#19170: 25.0.50; enhancement request: `compare-windows' use across frames,
Juri Linkov <=
- bug#19170: 25.0.50; enhancement request: `compare-windows' use across frames, Drew Adams, 2014/11/28
- bug#19170: 25.0.50; enhancement request: `compare-windows' use across frames, Juri Linkov, 2014/11/28
- bug#19170: 25.0.50; enhancement request: `compare-windows' use across frames, Drew Adams, 2014/11/28
- bug#19170: 25.0.50; enhancement request: `compare-windows' use across frames, Drew Adams, 2014/11/28