[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/el-search 23cf24d 275/332: [el-search] Enhancements to
From: |
Stefan Monnier |
Subject: |
[elpa] externals/el-search 23cf24d 275/332: [el-search] Enhancements to my last two commits |
Date: |
Tue, 1 Dec 2020 15:49:02 -0500 (EST) |
branch: externals/el-search
commit 23cf24d4882be872596b62d43aa47e403d1becb1
Author: Michael Heerdegen <michael_heerdegen@web.de>
Commit: Michael Heerdegen <michael_heerdegen@web.de>
[el-search] Enhancements to my last two commits
Also bump version to 1.8.1.
* packages/el-search/el-search.el
(el-search--search-and-replace-pattern): Use the modified flag of the
buffer to edit the replacement to decide if the user modified the
contents.
Some more minor tweaks.
---
el-search.el | 35 ++++++++++++++++++-----------------
1 file changed, 18 insertions(+), 17 deletions(-)
diff --git a/el-search.el b/el-search.el
index 9012a5f..c56e42a 100644
--- a/el-search.el
+++ b/el-search.el
@@ -7,7 +7,7 @@
;; Created: 29 Jul 2015
;; Keywords: lisp
;; Compatibility: GNU Emacs 25
-;; Version: 1.8
+;; Version: 1.8.1
;; Package-Requires: ((emacs "25") (stream "2.2.4") (cl-print "1.0"))
@@ -3798,8 +3798,7 @@ exactly you did? Thanks!"))))
(edit-replacement
(lambda (&optional ediff-only)
(save-excursion ;user may copy stuff from
base buffer etc.
- (let* ((buffer (get-buffer-create
- (generate-new-buffer-name
"*Replacement*")))
+ (let* ((buffer (generate-new-buffer
"*Replacement*"))
(window (display-buffer buffer)))
(select-window window)
(emacs-lisp-mode)
@@ -3817,6 +3816,8 @@ exactly you did? Thanks!"))))
'front-sticky t
'rear-nonsticky t)
"\n\n"))
(save-excursion (insert to-insert))
+ (let ((inhibit-message t))
+ (indent-region (point) (point-max)))
(let* ((owconf
(current-window-configuration))
(make-cleanup-fun
(lambda (&optional do)
@@ -3834,8 +3835,7 @@ exactly you did? Thanks!"))))
(abort (funcall
make-cleanup-fun
(lambda ()
- (let
((inhibit-read-only t))
- (delete-region
(point-min) (point-max)))
+ (set-buffer-modified-p
nil)
(exit-recursive-edit)))))
(set-keymap-parent map
(current-local-map))
(define-key map [(control ?c)
(control ?c)]
@@ -3865,19 +3865,19 @@ exactly you did? Thanks!"))))
(el-search-query-replace-ediff-replacement
(funcall
make-ediff-startup-hook-fun
#'exit-recursive-edit)))
+ (set-buffer-modified-p nil)
(recursive-edit)))
- (let ((content-now
- (with-current-buffer buffer
- (goto-char (point-min))
- (while (and (not (eobp))
- (looking-at
"^;;\\|^$"))
- (forward-line))
- (buffer-substring (point)
(point-max)))))
- (when (and (not (or (string= to-insert
content-now)
- (string-match-p (rx
bos (* space) eos)
-
content-now)))
+ (let ((new-to-insert
+ (and (buffer-modified-p buffer)
+ (with-current-buffer buffer
+ (goto-char (point-min))
+ (while (and (not (eobp))
+ (looking-at
"^;;\\|^$"))
+ (forward-line))
+ (buffer-substring (point)
(point-max))))))
+ (when (and new-to-insert
(y-or-n-p "Use modified
version?"))
- (setq to-insert content-now)))
+ (setq to-insert new-to-insert)))
(delete-window window)
(kill-buffer buffer))
(el-search--after-scroll (selected-window)
(window-start))
@@ -3926,7 +3926,8 @@ Ediff match with replacement")
(when (and
stop-for-comments
(not
(el-search-query-replace--comments-preserved-p
- original-text to-insert)))
+ (concat original-text "\n"
to-input-string)
+ to-insert)))
(pcase (if (eq stop-for-comments 'ask)
(car (read-multiple-choice
(propertize
- [elpa] externals/el-search 6df1362 332/332: * .gitignore: New file, (continued)
- [elpa] externals/el-search 6df1362 332/332: * .gitignore: New file, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 6c0475e 212/332: Allow to save the current el-search to a register, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 7c19468 215/332: Fix el-search's to register save when no search started yet, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search c7709ab 233/332: Fix el-search's check for buffers visiting a given file, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search cda69ae 230/332: * el-search/el-search-x.el: New user option `el-search-lazy-l', Stefan Monnier, 2020/12/01
- [elpa] externals/el-search ce8835b 242/332: [el-search] Factor out `el-search-backward', Stefan Monnier, 2020/12/01
- [elpa] externals/el-search dfaa7f2 244/332: [el-search] Some more minor tweaks, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search a6c23b5 250/332: * el-search/el-search.el: Correct NOERROR argument uses, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 2a02a81 277/332: [el-search] Let el-search-query-replace add undo boundaries, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 864f0ed 276/332: [el-search] Provide el-search-occur-search-object earlier, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 23cf24d 275/332: [el-search] Enhancements to my last two commits,
Stefan Monnier <=
- [elpa] externals/el-search effcb50 271/332: [el-search] Make r hit twice restore a replaced match, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search b9ba337 283/332: [el-search] Allow to work without installing key bindings, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 841a027 287/332: [el-search] Some optimization tweaks, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 70634b7 298/332: [el-search] Avoid bytecomp warning windows pop up, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 22c2f25 297/332: [el-search] Display colored defun match count, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 061464c 303/332: [el-search] Improvise eldoc support for search pattern prompt, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 9f4a9e5 310/332: [el-search] Improve "Make replacement editable and ediff'able", Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 3da4529 316/332: [el-search] Minor tweaks and version bump, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search e96c51e 319/332: [el-search] Key syntax cleanup, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search f091ed5 320/332: [el-search] Prefer rx forms to stringish regexps, Stefan Monnier, 2020/12/01