matchning av maskinnamn klarar wheat-chex

13b3db25 · Linus Tolke Y · 473518c5 · 13b3db25 · 13b3db25
Commit 13b3db25 authored Aug 16, 1991 by Linus Tolke Y
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

src/ChangeLog src/ChangeLog +3 -0

src/commands1.el src/commands1.el +3 -2

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
--- a/src/commands1.el
+++ b/src/commands1.el
@@ -1560,8 +1560,9 @@ MY-SESSION-NO is the session number of the running session."
 (defun lyskom-return-username (who-info)
  "Takes the username from the WHO-INFO and returns it on a better format."
  (let* ((username (who-info->username who-info))
-	 (type (or (string-match "\\(\\w+\\)%\\(.+\\)@\\(\\w+\\)" username)
-		   (string-match "\\(\\w+\\)@\\(\\w+\\)" username))))
+	 (type (or 
+		(string-match "\\([^%@.]+\\)%\\(.+\\)@\\([^%@.]+\\)" username)
+		(string-match "\\([^%@.]+\\)@\\([^%@.]+\\)" username))))
    (if type
 	(let ((name (substring username 0 (match-end 1)))
 	      (sent (if (match-beginning 3)