mirror of
https://github.com/jimeh/.emacs.d.git
synced 2026-02-19 13:46:41 +00:00
Jim Myhrberg
fe6a4e7ce5
I've set `lexical-binding` to `nil` in all Emacs Lisp files to suppress the warnings introduced in Emacs 31 requiring all elisp files to have a `lexical-binding` comment. This retains the default behavior of dynamic binding when no `lexical-binding` comment is present. With it set to `t` across the board, various things break, and fixing those is a task for another day.
26 lines
738 B
EmacsLisp
26 lines
738 B
EmacsLisp
;;; siren-ediff.el --- jimeh's Emacs Siren: ediff configuration. -*- lexical-binding: nil; -*-
|
|
|
|
;;; Commentary:
|
|
|
|
;; Basic configuration for ediff.
|
|
|
|
;;; Code:
|
|
|
|
(defun ediff-copy-both-to-C ()
|
|
"Copy both A and B variants to C."
|
|
(interactive)
|
|
(ediff-copy-diff
|
|
ediff-current-difference nil 'C nil
|
|
(concat
|
|
(ediff-get-region-contents ediff-current-difference 'A ediff-control-buffer)
|
|
(ediff-get-region-contents ediff-current-difference 'B ediff-control-buffer))))
|
|
|
|
(defun add-B-to-ediff-mode-map ()
|
|
"Assign B key to copy both A and B variants to C."
|
|
(define-key ediff-mode-map "B" 'ediff-copy-both-to-C))
|
|
|
|
(add-hook 'ediff-keymap-setup-hook 'add-B-to-ediff-mode-map)
|
|
|
|
(provide 'siren-ediff)
|
|
;;; siren-ediff.el ends here
|