aboutsummaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorJonas Bernoulli <jonas@bernoul.li>2015-08-12 16:50:53 +0200
committerJonas Bernoulli <jonas@bernoul.li>2015-08-12 16:50:53 +0200
commitb84a484c9a795a498b29bc75f0b80a71fc4fa96c (patch)
tree417ed39416a580e52a8528c817760e19fe7f0c64 /lisp
parenta9b7b63cc4e49ecd16f97900e42942c267bb9c17 (diff)
don't show hunk region boundaries when using v25.0.50
This is currently broken and the lines would be as high as every other line instead of one pixel. See http://debbugs.gnu.org/cgi/bugreport.cgi?bug=21243
Diffstat (limited to 'lisp')
-rw-r--r--lisp/magit-diff.el4
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/magit-diff.el b/lisp/magit-diff.el
index d195ddb..d8cc9ab 100644
--- a/lisp/magit-diff.el
+++ b/lisp/magit-diff.el
@@ -1967,7 +1967,9 @@ are highlighted."
(ov sbeg cbeg 'face 'magit-diff-lines-heading
'display (concat (magit-diff-hunk-region-header section) "\n"))
(ov cbeg rbeg 'face face 'priority 2)
- (when (and (window-system) magit-diff-show-lines-boundary)
+ (when (and (window-system) magit-diff-show-lines-boundary
+ ;; FIXME http://debbugs.gnu.org/cgi/bugreport.cgi?bug=21243
+ (version< emacs-version "25.0.50"))
(ov rbeg (1+ rbeg) 'before-string
(propertize (concat (propertize "\s" 'display '(space :height (1)))
(propertize "\n" 'line-height t))