[Emacs-diffs] Changes to emacs/lisp/erc/erc.el

[Miles Bader]

Index: emacs/lisp/erc/erc.el
diff -u emacs/lisp/erc/erc.el:1.9 emacs/lisp/erc/erc.el:1.10
--- emacs/lisp/erc/erc.el:1.9   Mon Mar 27 11:27:46 2006
+++ emacs/lisp/erc/erc.el       Tue Apr 11 22:09:49 2006
@@ -3132,7 +3132,7 @@
 
 (defun erc-cmd-SV ()
   "Say the current ERC and Emacs version into channel."
-  (erc-send-message (format "I'm using ERC %s with %s %s (%s%s%s)!"
+  (erc-send-message (format "I'm using ERC %s with %s %s (%s%s) of %s."
                            erc-version-string
                            (if (featurep 'xemacs) "XEmacs" "GNU Emacs")
                            emacs-version
@@ -3155,7 +3155,7 @@
                                                      x-toolkit-scroll-bars)))
                               "")
                             (if (featurep 'multi-tty) ", multi-tty" ""))
-                           (concat ", built " erc-emacs-build-time)))
+                           erc-emacs-build-time))
   t)
 
 (defun erc-cmd-SM ()
@@ -3490,7 +3490,7 @@
 If `point' is at the beginning of a channel name, use that as default."
   (interactive
    (list
-    (let ((chnl (if (looking-at "\\([&#+!][^ ]+\\)") (match-string 1) ""))
+    (let ((chnl (if (looking-at "\\([&#+!][^ \n]+\\)") (match-string 1) ""))
          (table (when (erc-server-buffer-live-p)
                   (set-buffer (process-buffer erc-server-process))
                   erc-channel-list)))
@@ -4734,12 +4734,12 @@
 
 Return a list of the three separate tokens."
   (cond
-   ((string-match "^\\([^!]*\\)!\\(address@hidden)@\\(.*\\)$" string)
+   ((string-match "^\\([^!\n]*\\)!\\(address@hidden)@\\(.*\\)$" string)
     (list (match-string 1 string)
          (match-string 2 string)
          (match-string 3 string)))
    ;; Some bogus bouncers send Nick!(null), try to live with that.
-   ((string-match "^\\([^!]*\\)!\\(.*\\)$" string)
+   ((string-match "^\\([^!\n]*\\)!\\(.*\\)$" string)
     (list (match-string 1 string)
          ""
          (match-string 2 string)))
@@ -5053,7 +5053,7 @@
   "Return the addressed target in MSG.
 
 The addressed target is the string before the first colon in MSG."
-  (if (string-match "^\\([^: ]*\\):" msg)
+  (if (string-match "^\\([^: \n]*\\):" msg)
       (match-string 1 msg)
     nil))