[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/anzu 7b3d95d495 183/288: Support Emacs 24 and 25
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/anzu 7b3d95d495 183/288: Support Emacs 24 and 25 |
Date: |
Thu, 6 Jan 2022 03:58:51 -0500 (EST) |
branch: elpa/anzu
commit 7b3d95d4958dd81ff4985de9a500edde470c24f6
Author: Syohei YOSHIDA <syohex@gmail.com>
Commit: Syohei YOSHIDA <syohex@gmail.com>
Support Emacs 24 and 25
'query-replace-defaults' format is different between Emacs 24 and 25.
It is dotted-pair in Emacs 24, while it is dotted-pair list in Emacs 25.
---
anzu.el | 23 ++++++++++++++++++-----
1 file changed, 18 insertions(+), 5 deletions(-)
diff --git a/anzu.el b/anzu.el
index 477a00a0ba..819b6f227e 100644
--- a/anzu.el
+++ b/anzu.el
@@ -221,6 +221,9 @@
(defconst anzu--mode-line-format '(:eval (anzu--update-mode-line)))
+(defsubst anzu--emacs25-p ()
+ (>= emacs-major-version 25))
+
(defsubst anzu--mode-line-not-set-p ()
(and (listp mode-line-format)
(member anzu--mode-line-format mode-line-format)))
@@ -297,12 +300,20 @@
(if use-regexp " regexp" "")
(if use-region " in region" "")) )
+(defsubst anzu--retrive-from-at-history ()
+ (let ((retrieve-func (if (anzu--emacs25-p) 'caar 'car)))
+ (query-replace-descr (funcall retrieve-func query-replace-defaults))))
+
+(defsubst anzu--retrive-to-at-history ()
+ (let ((retrieve-func (if (anzu--emacs25-p) 'cdar 'cdr)))
+ (query-replace-descr (funcall retrieve-func query-replace-defaults))))
+
(defun anzu--query-prompt (use-region use-regexp at-cursor)
(let ((prompt (anzu--query-prompt-base use-region use-regexp)))
(if (and query-replace-defaults (not at-cursor))
(format "%s (default %s -> %s) " prompt
- (query-replace-descr (caar query-replace-defaults))
- (query-replace-descr (cdar query-replace-defaults)))
+ (anzu--retrive-from-at-history)
+ (anzu--retrive-to-at-history))
prompt)))
(defvar anzu--replaced-markers nil)
@@ -429,9 +440,9 @@
(when (and (not is-empty) (not query-replace-defaults))
(setq anzu--last-replaced-count anzu--total-matched))
(if (and is-empty query-replace-defaults)
- (cons (caar query-replace-defaults)
+ (cons (anzu--retrive-from-at-history)
(query-replace-compile-replacement
- (cdar query-replace-defaults) use-regexp))
+ (anzu--retrive-to-at-history) use-regexp))
(add-to-history query-replace-from-history-variable from nil t)
(when use-regexp
(anzu--query-validate-from-regexp from))
@@ -541,7 +552,9 @@
(query-replace-compile-replacement
(let ((to (anzu--read-to-string from prompt beg end use-regexp
overlay-limit)))
(add-to-history query-replace-to-history-variable to nil t)
- (add-to-history 'query-replace-defaults (cons from to) nil t)
+ (if (anzu--emacs25-p)
+ (add-to-history 'query-replace-defaults (cons from to) nil t)
+ (setq query-replace-defaults (cons from to)))
to)
use-regexp))
- [nongnu] elpa/anzu d4dcd76f47 190/288: Merge pull request #48 from syohex/improve-history, (continued)
- [nongnu] elpa/anzu d4dcd76f47 190/288: Merge pull request #48 from syohex/improve-history, ELPA Syncer, 2022/01/06
- [nongnu] elpa/anzu 370b9f162f 181/288: Merge pull request #45 from syohex/fix-zero-width-replacement, ELPA Syncer, 2022/01/06
- [nongnu] elpa/anzu 8a1eb22317 174/288: Merge pull request #42 from syohex/fix-replace-command-bug, ELPA Syncer, 2022/01/06
- [nongnu] elpa/anzu a1f56b6dad 193/288: Merge pull request #50 from syohex/fix-default-input-49, ELPA Syncer, 2022/01/06
- [nongnu] elpa/anzu 6dd966b4e2 186/288: Implement separator feature of Emacs 25, ELPA Syncer, 2022/01/06
- [nongnu] elpa/anzu 5e87e8c07a 187/288: Use own history variable for maintenance, ELPA Syncer, 2022/01/06
- [nongnu] elpa/anzu 10a05eb50c 166/288: Disable blink-matching-paren for improvement, ELPA Syncer, 2022/01/06
- [nongnu] elpa/anzu 5abdc5b889 038/288: Update document, ELPA Syncer, 2022/01/06
- [nongnu] elpa/anzu 0418c2b6d4 041/288: Update document, ELPA Syncer, 2022/01/06
- [nongnu] elpa/anzu 218a63ce47 015/288: Highlight code and add screenshot explanation, ELPA Syncer, 2022/01/06
- [nongnu] elpa/anzu 7b3d95d495 183/288: Support Emacs 24 and 25,
ELPA Syncer <=
- [nongnu] elpa/anzu 6b217a457f 182/288: Bump up version and update Changes, ELPA Syncer, 2022/01/06
- [nongnu] elpa/anzu 3c178f75f3 197/288: Fix matching a literal string, ELPA Syncer, 2022/01/06
- [nongnu] elpa/anzu b486075ab4 204/288: Update requirement package version, ELPA Syncer, 2022/01/06
- [nongnu] elpa/anzu 5ee99678ca 229/288: Remove needless attribute, ELPA Syncer, 2022/01/06
- [nongnu] elpa/anzu 8667be50aa 240/288: Merge pull request #73 from lunaryorn/patch-1, ELPA Syncer, 2022/01/06
- [nongnu] elpa/anzu acfd0a49de 246/288: Threshold has to be nil or number., ELPA Syncer, 2022/01/06
- [nongnu] elpa/anzu 532db96e34 026/288: Add doc-string, ELPA Syncer, 2022/01/06
- [nongnu] elpa/anzu 349e772b84 019/288: Fix #5 issue, ELPA Syncer, 2022/01/06
- [nongnu] elpa/anzu 4cc1b6c9e0 030/288: Merge pull request #7 from bbatsov/doc-improvement, ELPA Syncer, 2022/01/06
- [nongnu] elpa/anzu 16fc5810b3 029/288: Merge pull request #6 from bbatsov/fix-comp-warning, ELPA Syncer, 2022/01/06