Make sure rg-literal are reset if the on error and quit

dajva · Nov 21, 2017 · 6898409 · 6898409
1 parent 6041de9
commit 6898409
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/rg.el b/rg.el
@@ -857,14 +857,20 @@ optional DEFAULT parameter is non nil the flag will be enabled by default."
 (defun rg-rerun-change-regexp ()
   "Rerun last search but prompt for new regexp."
   (interactive)
-  (setq rg-literal nil)
-  (rg-rerun-change-search-string))
+  (let ((rg-literal-orig rg-literal))
+    (setq rg-literal nil)
+    (condition-case nil
+        (rg-rerun-change-search-string)
+      ((error quit) (setq rg-literal rg-literal-orig)))))
 
 (defun rg-rerun-change-literal ()
   "Rerun last search but prompt for new literal."
   (interactive)
-  (setq rg-literal t)
-  (rg-rerun-change-search-string))
+  (let ((rg-literal-orig rg-literal))
+    (setq rg-literal t)
+    (condition-case nil
+        (rg-rerun-change-search-string)
+      ((error quit) (setq rg-literal rg-literal-orig)))))
 
 (defun rg-rerun-change-files()
   "Rerun last search but prompt for new files."