Improvements to url regexp.

[lurk.git] / lurk.el

diff --git a/lurk.el b/lurk.el
index 96b93ae..2f7e15a 100644 (file)
--- a/lurk.el
+++ b/lurk.el
@@ -543,8 +543,8 @@ portion of the source component of the message, as LURK doesn't use this.")
        (opt (group (: ":" (+ digit))))
        (opt (group (: "/"
                       (opt
-                       (* (any alnum "-/.,#:%=&_"))
-                       (any alnum "-/#:%=&_")))))))
+                       (* (any alnum "-/.,#:%=&_?~"))
+                       (any alnum "-/#:%=&_~")))))))
   "Imperfect regex used to find URLs in plain text.")
 
 (defun lurk-click-url (button)
@@ -782,10 +782,10 @@ portion of the source component of the message, as LURK doesn't use this.")
            (setq lurk-nick nick)
            (lurk-display-notice nil "Set default nick to '" nick "'")))
 
-        ((rx "LIST")
+        ((rx (: "LIST" (* whitespace) string-end))
          (lurk-display-notice nil "This command can generate lots of output. Use `LIST -yes' if you're sure."))
 
-        ((rx (: "LIST" (+ whitespace) "-YES"))
+        ((rx (: "LIST" (+ whitespace) "-YES" (* whitespace) string-end))
          (lurk-send-msg (lurk-msg nil nil "LIST")))
 
         ((rx "MSG "