emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[nongnu] elpa/iedit f79846e639 275/301: Fix issue #117


From: ELPA Syncer
Subject: [nongnu] elpa/iedit f79846e639 275/301: Fix issue #117
Date: Mon, 10 Jan 2022 22:59:10 -0500 (EST)

branch: elpa/iedit
commit f79846e6393813772ed89059452cea7911a9b425
Author: Thierry Volpiatto <thievol@posteo.net>
Commit: Victor <victorhge@gmail.com>

    Fix issue #117
    
    Use `cl-case` and not `case` and do not quote symbols in `cl-case` clauses.
---
 iedit-lib.el | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/iedit-lib.el b/iedit-lib.el
index 77846b02df..d5891da554 100755
--- a/iedit-lib.el
+++ b/iedit-lib.el
@@ -565,10 +565,10 @@ Apply the change to all the other occurrences. "
          (iedit-move-conjoined-overlays occurrence)
          (when (/= beg end)
                ;; apply the case pattern on the current occurrence
-               (case (overlay-get occurrence 'category)
-                 ('all-caps
+               (cl-case (overlay-get occurrence 'category)
+                 (all-caps
                   (upcase-region beg end))
-                 ('cap-initial
+                 (cap-initial
                   (when (= 0 offset) (capitalize-region beg end )))))
       (dolist (another-occurrence iedit-occurrences-overlays)
         (when (not (eq another-occurrence occurrence))
@@ -579,13 +579,14 @@ Apply the change to all the other occurrences. "
                          (goto-char beginning)
                          (insert-and-inherit
                           ;; preserve the case pattern of each occurrence
-                          (case (overlay-get another-occurrence 'category)
-                                ('no-change value)
-                                ('all-caps
-                                 (upcase value))
-                                ('cap-initial
-                                 (if (= 0 offset) (capitalize value)
-                                       value))))))
+                          (cl-case (overlay-get another-occurrence 'category)
+                            (no-change value)
+                            (all-caps
+                             (upcase value))
+                            (cap-initial
+                             (if (= 0 offset)
+                                  (capitalize value)
+                               value))))))
           (iedit-move-conjoined-overlays another-occurrence))))
        (when inhibit-modification-hooks
          ;; run the after change functions only once. It seems OK for c-mode
@@ -986,13 +987,14 @@ modification is not going to be applied to other 
occurrences."
                 (unless (eq beg end) ;; replacement
                   (goto-char beginning)
                   (insert-and-inherit
-                                  (case (overlay-get occurrence 'category)
-                                        ('all-caps
-                                         (upcase modified-string))
-                                        ('cap-initial 
-                                         (if (= 0 offset) (capitalize 
modified-string)
-                                               modified-string))
-                                        (t modified-string))))
+                                  (cl-case (overlay-get occurrence 'category)
+                                    (all-caps
+                                     (upcase modified-string))
+                                    (cap-initial 
+                                     (if (= 0 offset)
+                                          (capitalize modified-string)
+                                       modified-string))
+                                    (t modified-string))))
                 (iedit-move-conjoined-overlays occurrence))))
           (goto-char (+ (overlay-start ov) offset))))))
   (setq iedit-buffering nil)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]