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

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

[nongnu] elpa/evil-surround a92151def9 129/175: Revert "surround-functio


From: ELPA Syncer
Subject: [nongnu] elpa/evil-surround a92151def9 129/175: Revert "surround-function improvement for lisp modes (#134)"
Date: Mon, 9 Oct 2023 13:01:08 -0400 (EDT)

branch: elpa/evil-surround
commit a92151def9db892b4eaef687d1a7fbe5b97cc760
Author: Filipe Correa Lima da Silva <filipe.silva@bcb.gov.br>
Commit: Filipe Correa Lima da Silva <filipe.silva@bcb.gov.br>

    Revert "surround-function improvement for lisp modes (#134)"
    
    This reverts commit 5a20c9757eff64e1567d313eb254126aef2bf3b2.
---
 evil-surround.el           | 35 +++--------------------------------
 test/evil-surround-test.el | 13 +------------
 2 files changed, 4 insertions(+), 44 deletions(-)

diff --git a/evil-surround.el b/evil-surround.el
index 3478bd1175..fbcaee7203 100644
--- a/evil-surround.el
+++ b/evil-surround.el
@@ -76,34 +76,6 @@ This only affects inserting pairs, not deleting or changing 
them."
                        (function :tag "Function"))))
 (make-variable-buffer-local 'evil-surround-pairs-alist)
 
-(defcustom evil-surround-lisp-modes '(
-                                     cider-repl-mode
-                                     clojure-mode
-                                     clojurec-mode
-                                     clojurescript-mode
-                                     clojurex-mode
-                                     common-lisp-mode
-                                     emacs-lisp-mode
-                                     eshell-mode
-                                     geiser-repl-mode
-                                     inf-clojure-mode
-                                     inferior-emacs-lisp-mode
-                                     inferior-lisp-mode
-                                     inferior-scheme-mode
-                                     lisp-interaction-mode
-                                     lisp-mode
-                                     monroe-mode
-                                     racket-mode
-                                     racket-repl-mode
-                                     scheme-interaction-mode
-                                     scheme-mode
-                                     slime-repl-mode
-                                     stumpwm-mode
-                                     )
-  "List of Lisp-related modes."
-  :type '(repeat symbol)
-  :group 'evil-surround)
-
 (defcustom evil-surround-operator-alist
   '((evil-change . change)
     (evil-delete . delete))
@@ -133,9 +105,8 @@ Each item is of the form (OPERATOR . OPERATION)."
 (defun evil-surround-function ()
   "Read a functionname from the minibuffer and wrap selection in function call"
   (let ((fname (evil-surround-read-from-minibuffer "" "")))
-    (cons (format (if (member major-mode evil-surround-lisp-modes)
-                     "(%s " "%s(")
-                 (or fname "")) ")")))
+    (cons (format "%s(" (or fname ""))
+          ")")))
 
 (defun evil-surround-read-tag ()
   "Read a XML tag from the minibuffer."
@@ -186,7 +157,7 @@ See also `evil-surround-inner-overlay'."
         (while (looking-at regexp) (forward-char))
         (evil-set-range-beginning range (point))
         (goto-char (evil-range-end range))
-        (while (looking-back regexp nil) (backward-char))
+        (while (looking-back regexp) (backward-char))
         (evil-set-range-end range (point))))))
 
 (defun evil-surround-inner-overlay (char)
diff --git a/test/evil-surround-test.el b/test/evil-surround-test.el
index ae425ab33f..120bac5bb0 100644
--- a/test/evil-surround-test.el
+++ b/test/evil-surround-test.el
@@ -55,21 +55,10 @@
       :visual-end nil
       "argument1 argument2"
       (turn-on-evil-surround-mode)
-      (c-mode)
       ("ysiwffunction" [return])
       "function(argument1) argument2"
       ("W.")
-      "function(argument1) function(argument2)")
-    (evil-test-buffer
-      :visual-start nil
-      :visual-end nil
-      "argument1 argument2"
-      (turn-on-evil-surround-mode)
-      (emacs-lisp-mode)
-      ("ysiwffunction" [return])
-      "(function argument1) argument2"
-      ("$.")
-      "(function argument1) (function argument2)"))
+      "function(argument1) function(argument2)"))
   (ert-info ("even more examples from readme: tag surrounding with dot repeat")
     (evil-test-buffer
       :visual-start nil



reply via email to

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