emacs-diffs
[Top][All Lists]
Advanced

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

master 20124d7: ; Minor cleanup in re-builder after my last commit


From: Stefan Kangas
Subject: master 20124d7: ; Minor cleanup in re-builder after my last commit
Date: Fri, 3 Dec 2021 11:19:56 -0500 (EST)

branch: master
commit 20124d78e7b5a063a37eeecce06f4d42f0cf08ed
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    ; Minor cleanup in re-builder after my last commit
    
    * lisp/emacs-lisp/re-builder.el (reb-lisp-mode, reb-cook-regexp):
    Very minor cleanup (by popular demand).
---
 lisp/emacs-lisp/re-builder.el | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lisp/emacs-lisp/re-builder.el b/lisp/emacs-lisp/re-builder.el
index 8a87b5b..9be6ac6 100644
--- a/lisp/emacs-lisp/re-builder.el
+++ b/lisp/emacs-lisp/re-builder.el
@@ -274,8 +274,8 @@ Except for Lisp syntax this is the same as `reb-regexp'.")
   emacs-lisp-mode "RE Builder Lisp"
   "Major mode for interactively building symbolic Regular Expressions."
   ;; Pull in packages as needed
-  (cond ((eq reb-re-syntax 'rx)            ; rx-to-string is autoloaded
-         (require 'rx)))                   ; require rx anyway
+  (when (eq reb-re-syntax 'rx)          ; rx-to-string is autoloaded
+    (require 'rx))                      ; require rx anyway
   (reb-mode-common))
 
 (defvar reb-subexp-mode-map
@@ -606,9 +606,9 @@ optional fourth argument FORCE is non-nil."
 
 (defun reb-cook-regexp (re)
   "Return RE after processing it according to `reb-re-syntax'."
-  (cond ((eq reb-re-syntax 'rx)
-        (rx-to-string (eval (car (read-from-string re)))))
-       (t re)))
+  (if (eq reb-re-syntax 'rx)
+      (rx-to-string (eval (car (read-from-string re))))
+    re))
 
 (defun reb-update-regexp ()
   "Update the regexp for the target buffer.



reply via email to

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