diff options
| author | Alessandro Piras <laynor@gmail.com> | 2013-06-01 19:22:06 +0200 |
|---|---|---|
| committer | Alessandro Piras <laynor@gmail.com> | 2013-06-01 19:22:06 +0200 |
| commit | 8bbf65267f9c169b204fdae0aa36c7ed1d6a2ea9 (patch) | |
| tree | a12fbbb04062b613c29f0b2a8b1a7e9cdfb71d5b | |
| parent | b48aa605e877702961fed7f640f669a6d6837eae (diff) | |
Fix show-paren-overlay related bugs happening with the latest emacs (fix #298).
`show-paren-overlay` has been renamed to `show-paren--overlay`.
| -rw-r--r-- | CHANGES.org | 5 | ||||
| -rw-r--r-- | evil-integration.el | 10 | ||||
| -rw-r--r-- | evil.el | 4 |
3 files changed, 14 insertions, 5 deletions
diff --git a/CHANGES.org b/CHANGES.org index 1db83aa..0bc808f 100644 --- a/CHANGES.org +++ b/CHANGES.org @@ -1,5 +1,10 @@ * Changes and New Features in Evil +** News in 1.0.5 + + * Fix bug in `show-paren-mode` due to variable renaming in latest + emacs. + ** News in 1.0.4 * Undo one restriction when <c> argument is read in operator state. diff --git a/evil-integration.el b/evil-integration.el index 7970630..3b28e54 100644 --- a/evil-integration.el +++ b/evil-integration.el @@ -181,10 +181,12 @@ (narrow-to-region narrow (point-max))) ad-do-it)) ;; prevent the preceding pair from being highlighted - (when (overlayp show-paren-overlay) - (delete-overlay show-paren-overlay)) - (when (overlayp show-paren-overlay-1) - (delete-overlay show-paren-overlay-1)))))) + (dolist (ov '(show-paren--overlay + show-paren--overlay-1 + show-paren-overlay + show-paren-overlay-1)) + (let ((ov (and (boundp ov) (symbol-value ov)))) + (when (overlayp ov) (delete-overlay ov)))))))) ;;; Speedbar @@ -1,6 +1,7 @@ ;;; evil.el --- extensible vi layer -;; Author: Vegard Øye <vegard_oye at hotmail.com> +;; Authors: +;; Alessandro Piras <laynor@gmail.com> ;; Antono Vasiljev <antono.vasiljev at gmail.com> ;; Barry O'Reilly <gundaetiapo at gmail.com> ;; Christoph Lange <langec at web.de> @@ -15,6 +16,7 @@ ;; Sune Simonsen <sune.simonsen at jayway.com> ;; Thomas Hisch <thomas at opentech.at> ;; Ulrich Müller <ulm at gentoo.org> +;; Vegard Øye <vegard_oye at hotmail.com> ;; Winfred Lu <winfred.lu@gmail.com> ;; Wolfgang Jenkner <wjenkner at inode.at> ;; York Zhao <yzhao at telecor.com> |