aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Tom Willemsen2020-02-28 15:42:31 -0800
committerGravatar Tom Willemsen2020-02-28 15:42:31 -0800
commitf53709c0e80c9bf32c24b94fd7f2cf6a00e32352 (patch)
tree66e9a0844280092d627100dffe9600e31c7dda2e
parent30225bdd1fb9f1155c74e46d98178c1222f5f452 (diff)
downloademacs-config-f53709c0e80c9bf32c24b94fd7f2cf6a00e32352.tar.gz
emacs-config-f53709c0e80c9bf32c24b94fd7f2cf6a00e32352.zip
Fix diff-hl-mode for P4
-rw-r--r--oni-diff-hl.el4
-rw-r--r--oni-nxml/.#oni-nxml.el1
2 files changed, 4 insertions, 1 deletions
diff --git a/oni-diff-hl.el b/oni-diff-hl.el
index 2f87ced..7fbc28b 100644
--- a/oni-diff-hl.el
+++ b/oni-diff-hl.el
@@ -4,7 +4,7 @@
;; Author: Tom Willemse <tom@ryuslash.org>
;; Keywords: local
-;; Version: 2019.0904.210452
+;; Version: 2020.0228.154151
;; Package-Requires: (diff-hl)
;; This program is free software; you can redistribute it and/or modify
@@ -26,6 +26,8 @@
;;; Code:
+(require 'diff-hl)
+
(defun oni:with-diff-hl-p4-args (orig-fun &rest args)
"Add Perforce-specific command-line arguments to `diff-hl-mode'.
diff --git a/oni-nxml/.#oni-nxml.el b/oni-nxml/.#oni-nxml.el
new file mode 100644
index 0000000..5747c92
--- /dev/null
+++ b/oni-nxml/.#oni-nxml.el
@@ -0,0 +1 @@
+WillemsenT@R-TWILLEMSE2223.17096:1582569692 \ No newline at end of file