pestctrl/emacs-config
1
0
Fork 0
mirror of https://github.com/pestctrl/emacs-config.git synced 2026-02-16 08:14:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

HO MY GAH

Browse source 
Never again will I have ediff window-related problems
This commit is contained in:
Benson Chu 2023-05-13 08:46:24 -05:00
parent a69d6a1278
commit a90fb11c2d
2 changed files with 25 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
config-min.org
View file

@ -469,6 +469,19 @@
(setq ediff-window-setup-function 'ediff-setup-windows-plain (setq ediff-window-setup-function 'ediff-setup-windows-plain
ediff-split-window-function 'split-window-horizontally) ediff-split-window-function 'split-window-horizontally)
(defun ediff-clear-up-windows (&rest optional)
(let ((tab-name (alist-get 'name (tab-bar--current-tab))))
(unless (string-match-p "-ediff$" tab-name)
(switch-or-create-tab (concat tab-name "-ediff"))))
(when (window-parameter (selected-window) 'window-side)
(window-toggle-side-windows))
(let ((ignore-window-parameters t))
(delete-other-windows)))
(advice-add #'ediff-setup
:before
#'ediff-clear-up-windows)
(require 'ediff-transition) (require 'ediff-transition)
(defun ediff-copy-both-to-C () (defun ediff-copy-both-to-C ()

26
lisp/ediff-transition.el
View file

@ -78,20 +78,18 @@
(defun ediff-transition-llvm-print-after-all (buffer) (defun ediff-transition-llvm-print-after-all (buffer)
(interactive (interactive
(list (current-buffer))) (list (current-buffer)))
(let ((window--sides-inhibit-check t)) (save-excursion
(set-window-parameter (selected-window) 'window-side nil) (goto-char (point-min))
(save-excursion (let ((r (rx line-start (optional "# ") "*** "))
(goto-char (point-min)) flist)
(let ((r (rx line-start (optional "# ") "*** ")) (re-search-forward r)
flist) (let ((previous-index (match-beginning 0)))
(re-search-forward r) (while (re-search-forward r nil t)
(let ((previous-index (match-beginning 0))) (let ((file (make-temp-file "llvm-print-after-all-" nil ".ll")))
(while (re-search-forward r nil t) (write-region previous-index (match-beginning 0) file)
(let ((file (make-temp-file "llvm-print-after-all-" nil ".ll"))) (push file flist))
(write-region previous-index (match-beginning 0) file) (setq previous-index (match-beginning 0))))
(push file flist)) (ediff-transition (reverse flist)))))
(setq previous-index (match-beginning 0))))
(ediff-transition (reverse flist))))))
;; (ediff-transition ;; (ediff-transition
;; (mapcar #'(lambda (x) ;; (mapcar #'(lambda (x)