branch: externals/agitate commit 6c89d239549e06b5e3753975e54d1a5a27464c2d Author: Protesilaos Stavrou <i...@protesilaos.com> Commit: Protesilaos Stavrou <i...@protesilaos.com>
Remove agitate-diff-kill-dwim (doesn't work) The idea is neat and we could also leverage the built-in method to split a diff hunk, but it ultimately fails to apply the patch... --- README.org | 10 ---------- agitate.el | 29 ----------------------------- 2 files changed, 39 deletions(-) diff --git a/README.org b/README.org index 6cebf5132f..97bbc9b5ec 100644 --- a/README.org +++ b/README.org @@ -83,16 +83,6 @@ The following sections document the extras per their scope. With optional =NARROW-FILE= as a prefix argument, operate on the current file instead. -#+findex: agitate-diff-kill-dwim -+ ~agitate-diff-kill-dwim~ :: PROTOTYPE!!! Kill hunk or remove the - plus/minus signs in current line/region. When the region is active, - remove the plus or minus sign at the start of each line. When the - region is not active but point is on a line that starts with a plus - or minus sign, remove that sign. Removing the plus or minus sign - means any subsequent commit will not account for them. If no region - is active and the point is not on a line that starts with the plus - or minus sign, call ~diff-hunk-kill~ interactively. - #+findex: agitate-diff-enable-outline-minor-mode + ~agitate-diff-enable-outline-minor-mode~ :: Enable ~outline-minor-mode~ with appropriate tweaks for diffs. This diff --git a/agitate.el b/agitate.el index 249efae604..951e5b7976 100644 --- a/agitate.el +++ b/agitate.el @@ -137,35 +137,6 @@ instead." (diff-restrict-view) (message "Narrowed to diff HUNK"))))) -;;;###autoload -(defun agitate-diff-kill-dwim () - "PROTOTYPE. - -Kill hunk or remove the plus/minus signs in current line/region. - -When the region is active, remove the plus or minus sign at the -start of each line. - -When the region is not active but point is on a line that starts -with a plus or minus sign, remove that sign. - -Removing the plus or minus sign means any subsequent commit will -not account for them. - -If no region is active and the point is not on a line that starts -with the plus or minus sign, call `diff-hunk-kill' interactively." - (interactive nil diff-mode) - (unless mark-ring ; needed when entering a new buffer - (push-mark (point) t nil)) - (when-let (((derived-mode-p 'diff-mode)) - (inhibit-read-only t)) - (cond - ((region-active-p) - (replace-regexp-in-region "^[+-]" " " (region-beginning) (region-end))) - ((progn (goto-char (line-beginning-position)) (looking-at "^[+-]")) - (replace-match " ")) - (t (call-interactively #'diff-hunk-kill))))) - (defvar outline-minor-mode-highlight) ;;;###autoload