Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

some more bug fixes for iedit #3

Merged
merged 8 commits into from Jan 27, 2012
Merged

some more bug fixes for iedit #3

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e6f5585
fix org-mode text-property compatibility (use insert-and-inherit)
Jan 24, 2012
13ecba1
Merge branch 'upstream-master'
Jan 24, 2012
dd7d2f9
fix org-mode text-property compatibility (use insert-and-inherit)
Jan 24, 2012
c5a0d4d
fix zero-width rectangle insertion
Jan 24, 2012
1d070b7
move init code for iedit-mode-map inside defvar
Jan 24, 2012
d5d4027
fix `iedit-toggle-unmatched-lines-visible' for rectangles
Jan 25, 2012
a75c446
fix bug with autopair and iedit-rect
Jan 26, 2012
20c1075
remove conditions on setting `iedit-before-modification-string'.
Jan 26, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
126 changes: 67 additions & 59 deletions iedit.el
View file
Open in desktop
Expand Up @@ -160,10 +160,10 @@ before a change is made.")
"This is buffer local variable which is the buffer substring that is going to be changed.") "This is buffer local variable which is the buffer substring that is going to be changed.")


;; `iedit-occurrence-update' gets called twice when change==0 and occurrence ;; `iedit-occurrence-update' gets called twice when change==0 and occurrence
;; is zero-width ;; is zero-width (beg==end)
;; -- for front and back insertion. ;; -- for front and back insertion.
(defvar iedit-last-overlay nil (defvar iedit-skipped-modification-once nil
"This is buffer local variable which records processed overlay so they don't get processed multiple times. See code.") "Variable used to skip first modification hook run when insertion against a zero-width occurrence.")


(defvar iedit-aborting nil (defvar iedit-aborting nil
"This is buffer local variable which indicates iedit-mode is aborting.") "This is buffer local variable which indicates iedit-mode is aborting.")
Expand Down Expand Up @@ -242,22 +242,21 @@ This is like `describe-bindings', but displays only Iedit keys."
(describe-function 'iedit-mode))) (describe-function 'iedit-mode)))


;;; Define iedit mode map ;;; Define iedit mode map
(defvar iedit-mode-map nil (defvar iedit-mode-map
(let ((map (make-sparse-key-map)))
(setq iedit-mode-map (make-sparse-keymap))
;; Default key bindings
(define-key iedit-mode-map (kbd "TAB") 'iedit-next-occurrence)
(define-key iedit-mode-map (kbd "<S-tab>") 'iedit-prev-occurrence)
(define-key iedit-mode-map (kbd "<S-iso-lefttab>") 'iedit-prev-occurrence)
(define-key iedit-mode-map (kbd "<backtab>") 'iedit-prev-occurrence)
(define-key iedit-mode-map (kbd "C-'") 'iedit-toggle-unmatched-lines-visible)
(define-key iedit-mode-map (char-to-string help-char) iedit-help-map)
(define-key iedit-mode-map [help] iedit-help-map)
(define-key iedit-mode-map [f1] iedit-help-map)
map)
"Keymap used while iedit mode is enabled.") "Keymap used while iedit mode is enabled.")


(if iedit-mode-map
nil
(setq iedit-mode-map (make-sparse-keymap))
;; Default key bindings
(define-key iedit-mode-map (kbd "TAB") 'iedit-next-occurrence)
(define-key iedit-mode-map (kbd "<S-tab>") 'iedit-prev-occurrence)
(define-key iedit-mode-map (kbd "<S-iso-lefttab>") 'iedit-prev-occurrence)
(define-key iedit-mode-map (kbd "<backtab>") 'iedit-prev-occurrence)
(define-key iedit-mode-map (kbd "C-'") 'iedit-toggle-unmatched-lines-visible)
(define-key iedit-mode-map (char-to-string help-char) iedit-help-map)
(define-key iedit-mode-map [help] iedit-help-map)
(define-key iedit-mode-map [f1] iedit-help-map))

(or (assq 'iedit-mode minor-mode-map-alist) (or (assq 'iedit-mode minor-mode-map-alist)
(setq minor-mode-map-alist (setq minor-mode-map-alist
(cons (cons 'iedit-mode iedit-mode-map) minor-mode-map-alist))) (cons (cons 'iedit-mode iedit-mode-map) minor-mode-map-alist)))
Expand Down Expand Up @@ -303,7 +302,7 @@ Commands:
(or (not transient-mark-mode) (not mark-active) (or (not transient-mark-mode) (not mark-active)
(equal (mark) (point))) (equal (mark) (point)))
iedit-last-occurrence-in-history) iedit-last-occurrence-in-history)
(setq occurrence iedit-last-occurrence-in-history)) (setq occurrence iedit-last-occurrence-in-history))
((and arg ((and arg
transient-mark-mode mark-active (not (equal (mark) (point)))) transient-mark-mode mark-active (not (equal (mark) (point))))
(setq rect-string t)) (setq rect-string t))
Expand Down Expand Up @@ -356,11 +355,6 @@ Commands:
(concat (substring occurrence-exp 0 50) "...") (concat (substring occurrence-exp 0 50) "...")
occurrence-exp))))) occurrence-exp)))))


(defun iedit-reset-last-overlay ()
"`post-command-hook' function to reset iedit-last-overlay and also remove itself from post-command-hook."
(remove-hook 'post-command-hook 'iedit-reset-last-overlay t)
(setq iedit-last-overlay nil))

(defun iedit-reset-aborting () (defun iedit-reset-aborting ()
"Turning iedit-mode off and reset iedit-aborting. `iedit-done' "Turning iedit-mode off and reset iedit-aborting. `iedit-done'
is postponed after the command is executed for avoiding is postponed after the command is executed for avoiding
Expand All @@ -385,15 +379,17 @@ iedit-occurrence-update is called for a removed overlay."
(rotatef beg-col end-col)) (rotatef beg-col end-col))
(goto-char beg) (goto-char beg)
(loop do (progn (loop do (progn
(push (iedit-make-occurrence-overlay (progn (push (iedit-make-occurrence-overlay
(move-to-column beg-col t) (progn
(point)) (move-to-column beg-col t)
(progn (point))
(move-to-column end-col t) (progn
(point))) (move-to-column end-col t)
(point)))
iedit-occurrences-overlays) iedit-occurrences-overlays)
(forward-line 1)) (forward-line 1))
until (> (point) end)) until (> (point) end))
(setq iedit-occurrences-overlays (nreverse iedit-occurrences-overlays))
(goto-char orig-p))) (goto-char orig-p)))


(defun iedit-hide-unmatched-lines () (defun iedit-hide-unmatched-lines ()
Expand Down Expand Up @@ -466,42 +462,54 @@ exit iedti mode."
(when (and (not iedit-aborting ) (when (and (not iedit-aborting )
(not undo-in-progress)) ; undo will do all the update (not undo-in-progress)) ; undo will do all the update
;; before modification ;; before modification
(if (null after) (if (null after)
(if (or (< beg (overlay-start occurrence)) (if (or (< beg (overlay-start occurrence))
(> end (overlay-end occurrence))) (> end (overlay-end occurrence)))
(progn (setq iedit-aborting t) ; abort iedit-mode (progn (setq iedit-aborting t) ; abort iedit-mode
(add-hook 'post-command-hook 'iedit-reset-aborting nil t)) (add-hook 'post-command-hook 'iedit-reset-aborting nil t))
(progn (setq iedit-before-modification-beg beg) (progn (setq iedit-before-modification-beg beg)
(setq iedit-before-modification-end end) (setq iedit-before-modification-end end)
(unless (eq beg end) (setq iedit-before-modification-string
(setq iedit-before-modification-string (buffer-substring-no-properties beg end))))
(buffer-substring-no-properties beg end))))) ;; after modification
;; after modification ;; todo more ellaborate on these conditions
(when (or (eq 0 change) ;; insertion ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(eq beg end) ;; deletion ;; Check if we are inserting into zero-width occurrence. ;;
(not (eq occurrence iedit-last-overlay)) ;; ;;
(not (string= iedit-before-modification-string ;; If so, then TWO modificaiton hooks will be called -- ;;
(buffer-substring-no-properties beg end)))) ;; "insert-in-front-hooks" and "insert-behind-hooks". ;;
(setq iedit-last-overlay occurrence) ;; ;;
(add-hook 'post-command-hook 'iedit-reset-last-overlay nil t) ;; We need to run just once. ;;
(let ((inhibit-modification-hooks t) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(offset (- beg (overlay-start occurrence)))
(value (buffer-substring beg end))) (if (and (= beg (overlay-start occurrence))
(save-excursion (= end (overlay-end occurrence))
;; insertion or yank (= change 0)
(if (eq 0 change) (not iedit-skipped-modification-once))
(setq iedit-skipped-modification-once t)
(setq iedit-skipped-modification-once nil)
(when (and (or (eq 0 change) ;; insertion
(eq beg end) ;; deletion
(not (string= iedit-before-modification-string
(buffer-substring-no-properties beg end)))))
(let ((inhibit-modification-hooks t)
(offset (- beg (overlay-start occurrence)))
(value (buffer-substring beg end)))
(save-excursion
;; insertion or yank
(if (eq 0 change)
(dolist (like-occurrence (remove occurrence iedit-occurrences-overlays))
(progn
(goto-char (+ (overlay-start like-occurrence) offset))
(insert-and-inherit value)))
;; deletion
(dolist (like-occurrence (remove occurrence iedit-occurrences-overlays)) (dolist (like-occurrence (remove occurrence iedit-occurrences-overlays))
(progn (let* ((beginning (+ (overlay-start like-occurrence) offset))
(goto-char (+ (overlay-start like-occurrence) offset)) (ending (+ beginning change)))
(insert value))) (delete-region beginning ending)
;; deletion (unless (eq beg end) ;; replacement
(dolist (like-occurrence (remove occurrence iedit-occurrences-overlays)) (goto-char beginning)
(let* ((beginning (+ (overlay-start like-occurrence) offset)) (insert-and-inherit value))))))))))))
(ending (+ beginning change)))
(delete-region beginning ending)
(unless (eq beg end) ;; replacement
(goto-char beginning)
(insert value)))))))))))
;; (elp-instrument-list '(insert delete-region goto-char iedit-occurrence-update buffer-substring-no-properties string= re-search-forward replace-match)) ;; (elp-instrument-list '(insert delete-region goto-char iedit-occurrence-update buffer-substring-no-properties string= re-search-forward replace-match))


;; slowest verion: ;; slowest verion:
Expand Down Expand Up @@ -530,7 +538,7 @@ exit iedti mode."
;; occurrence and is responsible for updating all other ;; occurrence and is responsible for updating all other
;; occurrences." ;; occurrences."
;; (when (not undo-in-progress) ; undo will do all the work ;; (when (not undo-in-progress) ; undo will do all the work
;; (if (null after) ;; (if (null after)
;; (if (or (< beg (overlay-start occurrence)) ;; (if (or (< beg (overlay-start occurrence))
;; (> end (overlay-end occurrence))) ;; (> end (overlay-end occurrence)))
;; (iedit-done) ;; (iedit-done)
Expand Down