Permalink
Browse files

Merge remote-tracking branch 'lewang/ensure-skip-mofication-once' int…

…o lewang-master

Conflicts:
	iedit.el
  • Loading branch information...
Le Wang
Le Wang committed Feb 9, 2013
2 parents f2868a6 + 50748a5 commit 75ec59521e9f3d6de6b49846ba20d730e2db22f6
Showing with 6 additions and 3 deletions.
  1. +4 −0 iedit-rect.el
  2. +2 −3 iedit.el
View
@@ -93,6 +93,10 @@ Commands:
(interactive (when (iedit-region-active)
(list (region-beginning)
(region-end))))
+
+ ;; enforce skip modification once, errors may happen to cause this to be
+ ;; unset.
+ (setq iedit-skip-modification-once t)
(if iedit-rectangle-mode
(iedit-rectangle-done)
(iedit-barf-if-lib-active)
View
@@ -376,10 +376,9 @@ Keymap used within overlays:
(defun iedit-start (occurrence-regexp beg end)
"Start Iedit mode for the `occurrence-regexp' in the current buffer."
- ;; attempt to fix random unsetting of `iedit-skip-modification-once'
+ ;; enforce skip modification once, errors may happen to cause this to be
+ ;; unset.
(setq iedit-skip-modification-once t)
-
-
(setq iedit-unmatched-lines-invisible iedit-unmatched-lines-invisible-default)
(setq iedit-initial-region (list beg end))
(iedit-start2 occurrence-regexp beg end)

0 comments on commit 75ec595

Please sign in to comment.