[elpa] master 07e5ab2 3/3: Merge commit '857d2a42e92040a3009394da21e4d37c98d43c87'

[Justin Burkett]

branch: master
commit 07e5ab2a06f86a779cba517735cdb9c06c6f287b
Merge: 704d986 857d2a4
Author: Justin Burkett <address@hidden>
Commit: Justin Burkett <address@hidden>

    Merge commit '857d2a42e92040a3009394da21e4d37c98d43c87'
---
 packages/vdiff/vdiff.el | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/packages/vdiff/vdiff.el b/packages/vdiff/vdiff.el
index b302f86..5ca2605 100644
--- a/packages/vdiff/vdiff.el
+++ b/packages/vdiff/vdiff.el
@@ -5,7 +5,7 @@
 ;; Author: Justin Burkett <address@hidden>
 ;; Maintainer: Justin Burkett <address@hidden>
 ;; URL: https://github.com/justbur/emacs-vdiff
-;; Version: 0.2.2
+;; Version: 0.2.3
 ;; Keywords: diff
 ;; Package-Requires: ((emacs "24.4") (hydra "0.13.0"))
 
@@ -373,18 +373,24 @@ point."
           (throw 'yes ovr))))))
 
 (defun vdiff--hunk-at-point-p ()
-  "Return first vdiff hunk overlay found at point."
+  "Non-nil if point is in hunk overlay.
+
+Returns overlay."
   (let ((ovr (vdiff--overlay-at-pos)))
     (and (overlayp ovr)
          (overlay-get ovr 'vdiff-type)
-         (not (eq (overlay-get ovr 'vdiff-type) 'fold)))))
+         (not (eq (overlay-get ovr 'vdiff-type) 'fold))
+         ovr)))
 
 (defun vdiff--fold-at-point-p ()
-  "Return first vdiff fold overlay found at point."
+  "Non-nil if point is in fold overlay.
+
+Returns overlay."
   (let ((ovr (vdiff--overlay-at-pos)))
     (and (overlayp ovr)
          (overlay-get ovr 'vdiff-type)
-         (eq (overlay-get ovr 'vdiff-type) 'fold))))
+         (eq (overlay-get ovr 'vdiff-type) 'fold)
+         ovr)))
 
 (defun vdiff--overlays-in-region (beg end)
   "Return any vdiff overlays found within BEG and END."