emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/diff-hl 60f3da2 1/2: diff-hl-margin-local-mode: New nam


From: ELPA Syncer
Subject: [elpa] externals/diff-hl 60f3da2 1/2: diff-hl-margin-local-mode: New name and autoload
Date: Fri, 12 Feb 2021 19:57:08 -0500 (EST)

branch: externals/diff-hl
commit 60f3da25cc9ea009224b914777dd3565d538afe6
Author: Dmitry Gutov <dgutov@yandex.ru>
Commit: Dmitry Gutov <dgutov@yandex.ru>

    diff-hl-margin-local-mode: New name and autoload
    
    Should resolve #155.
---
 diff-hl-margin.el | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/diff-hl-margin.el b/diff-hl-margin.el
index a3b8b9e..b63bb89 100644
--- a/diff-hl-margin.el
+++ b/diff-hl-margin.el
@@ -82,30 +82,31 @@
   :lighter "" :global t
   (if diff-hl-margin-mode
       (progn
-        (add-hook 'diff-hl-mode-on-hook 'diff-hl-margin-minor-mode)
-        (add-hook 'diff-hl-mode-off-hook 'diff-hl-margin-minor-mode-off)
-        (add-hook 'diff-hl-dired-mode-on-hook 'diff-hl-margin-minor-mode)
-        (add-hook 'diff-hl-dired-mode-off-hook 'diff-hl-margin-minor-mode-off))
-    (remove-hook 'diff-hl-mode-on-hook 'diff-hl-margin-minor-mode)
-    (remove-hook 'diff-hl-mode-off-hook 'diff-hl-margin-minor-mode-off)
-    (remove-hook 'diff-hl-dired-mode-on-hook 'diff-hl-margin-minor-mode)
-    (remove-hook 'diff-hl-dired-mode-off-hook 'diff-hl-margin-minor-mode-off))
+        (add-hook 'diff-hl-mode-on-hook 'diff-hl-margin-local-mode)
+        (add-hook 'diff-hl-mode-off-hook 'diff-hl-margin-local-mode-off)
+        (add-hook 'diff-hl-dired-mode-on-hook 'diff-hl-margin-local-mode)
+        (add-hook 'diff-hl-dired-mode-off-hook 'diff-hl-margin-local-mode-off))
+    (remove-hook 'diff-hl-mode-on-hook 'diff-hl-margin-local-mode)
+    (remove-hook 'diff-hl-mode-off-hook 'diff-hl-margin-local-mode-off)
+    (remove-hook 'diff-hl-dired-mode-on-hook 'diff-hl-margin-local-mode)
+    (remove-hook 'diff-hl-dired-mode-off-hook 'diff-hl-margin-local-mode-off))
   (dolist (buf (buffer-list))
     (with-current-buffer buf
       (cond
        (diff-hl-mode
-        (diff-hl-margin-minor-mode (if diff-hl-margin-mode 1 -1))
+        (diff-hl-margin-local-mode (if diff-hl-margin-mode 1 -1))
         (diff-hl-update))
        (diff-hl-dired-mode
-        (diff-hl-margin-minor-mode (if diff-hl-margin-mode 1 -1))
+        (diff-hl-margin-local-mode (if diff-hl-margin-mode 1 -1))
         (diff-hl-dired-update))))))
 
-(define-minor-mode diff-hl-margin-minor-mode
+;;;###autoload
+(define-minor-mode diff-hl-margin-local-mode
   "Toggle displaying `diff-hl-mode' highlights on the margin locally.
 You probably shouldn't use this function directly."
   :lighter ""
   (let ((width-var (intern (format "%s-margin-width" diff-hl-side))))
-    (if diff-hl-margin-minor-mode
+    (if diff-hl-margin-local-mode
         (progn
           (set (make-local-variable 'diff-hl-margin-old-highlight-function)
                diff-hl-highlight-function)
@@ -121,8 +122,8 @@ You probably shouldn't use this function directly."
 
 (define-obsolete-variable-alias 'diff-hl-margin-side 'diff-hl-side "1.7.1")
 
-(defun diff-hl-margin-minor-mode-off ()
-  (diff-hl-margin-minor-mode -1))
+(defun diff-hl-margin-local-mode-off ()
+  (diff-hl-margin-local-mode -1))
 
 (defvar diff-hl-margin-spec-cache nil)
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]