diff options
| author | Jonas Bernoulli <jonas@bernoul.li> | 2015-08-14 19:52:47 +0200 |
|---|---|---|
| committer | Jonas Bernoulli <jonas@bernoul.li> | 2015-08-14 19:52:47 +0200 |
| commit | 492c7aab19d215b2330bdd9b1498d41bb3274290 (patch) | |
| tree | 996fb1037ef52b2d587cb066078faf352c3b0e08 /lisp | |
| parent | 878088719dc52ab7a470a094238666737ce5e8dc (diff) | |
Revert "don't show hunk region boundaries when using v25.0.50"
This reverts commit b84a484c9a795a498b29bc75f0b80a71fc4fa96c.
The bug this worked around has been fixed in Emacs v25.0.50.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/magit-diff.el | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lisp/magit-diff.el b/lisp/magit-diff.el index d8cc9ab..d195ddb 100644 --- a/lisp/magit-diff.el +++ b/lisp/magit-diff.el @@ -1967,9 +1967,7 @@ 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 - ;; FIXME http://debbugs.gnu.org/cgi/bugreport.cgi?bug=21243 - (version< emacs-version "25.0.50")) + (when (and (window-system) magit-diff-show-lines-boundary) (ov rbeg (1+ rbeg) 'before-string (propertize (concat (propertize "\s" 'display '(space :height (1))) (propertize "\n" 'line-height t)) |