diff options
| -rw-r--r-- | init.el | 7 | ||||
| -rw-r--r-- | lisp/acdw.el | 2 |
2 files changed, 6 insertions, 3 deletions
| diff --git a/init.el b/init.el index 2e982df..0b973e5 100644 --- a/init.el +++ b/init.el | |||
| @@ -597,8 +597,11 @@ AKA, DO NOT USE THIS FUNCTION!!!" | |||
| 597 | cmd)))))) | 597 | cmd)))))) |
| 598 | 598 | ||
| 599 | (setup ediff | 599 | (setup ediff |
| 600 | (:option ediff-window-setup-function #'ediff-setup-windows-plain | 600 | (:option ediff-diff-options "-w" ; ignore whitespace |
| 601 | ediff-split-window-function #'split-window-horizontally)) | 601 | ediff-window-setup-function #'ediff-setup-windows-plain |
| 602 | ediff-split-window-function #'split-window-horizontally) | ||
| 603 | ;; https://oremacs.com/2015/01/17/setting-up-ediff/ | ||
| 604 | (add-hook 'ediff-after-quit-hook-internal #'winner-undo)) | ||
| 602 | 605 | ||
| 603 | (setup (:straight edit-indirect)) | 606 | (setup (:straight edit-indirect)) |
| 604 | 607 | ||
| diff --git a/lisp/acdw.el b/lisp/acdw.el index d789a74..91381da 100644 --- a/lisp/acdw.el +++ b/lisp/acdw.el | |||
| @@ -564,7 +564,7 @@ It's called 'require-private' for historical reasons." | |||
| 564 | (sort-beg (progn (beginning-of-defun) | 564 | (sort-beg (progn (beginning-of-defun) |
| 565 | (re-search-forward "[ \\t]*(" (point-at-eol)) | 565 | (re-search-forward "[ \\t]*(" (point-at-eol)) |
| 566 | (forward-sexp) | 566 | (forward-sexp) |
| 567 | (re-search-forward "\\<" (point-at-eol)) | 567 | (re-search-forward "\\_<" (point-at-eol)) |
| 568 | (point-marker)))) | 568 | (point-marker)))) |
| 569 | (narrow-to-region (1- sort-beg) (1+ sort-end)) | 569 | (narrow-to-region (1- sort-beg) (1+ sort-end)) |
| 570 | (sort-subr nil #'sort-setq-next-record #'sort-setq-end-record))))) | 570 | (sort-subr nil #'sort-setq-next-record #'sort-setq-end-record))))) |