From e4764a0788bbc6601a23fb11f4300cd3ef4d4d5c Mon Sep 17 00:00:00 2001 From: Tom Willemse Date: Tue, 19 Feb 2019 00:52:57 -0800 Subject: [PATCH] Add oni-diff-hl --- oni-diff-hl.el | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 oni-diff-hl.el diff --git a/oni-diff-hl.el b/oni-diff-hl.el new file mode 100644 index 0000000..9020c8a --- /dev/null +++ b/oni-diff-hl.el @@ -0,0 +1,44 @@ +;;; oni-diff-hl.el --- diff-hl configuration -*- lexical-binding: t; -*- + +;; Copyright (C) 2019 Tom Willemse + +;; Author: Tom Willemse +;; Keywords: local +;; Version: 20190219004948 +;; Package-Requires: (diff-hl) + +;; This program is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; This program is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with this program. If not, see . + +;;; Commentary: + +;; Configuration for `diff-hl-mode'. + +;;; Code: + +(defun oni:with-diff-hl-p4-args (orig-fun &rest args) + "Add Perforce-specific command-line arguments to `diff-hl-mode'. + +ORIG-FUN is the function being wrapped, ARGS are the arguments specified" + (let ((p4-lowlevel-diff-switches '("-du0"))) + (apply orig-fun args))) + +(with-eval-after-load 'vc-p4 + (add-function :around (symbol-function 'diff-hl-changes-buffer) + #'oni:with-diff-hl-p4-args)) + +;;;###autoload +(global-diff-hl-mode) + +(provide 'oni-diff-hl) +;;; oni-diff-hl.el ends here