(erc-noncommands-list, noncommands, erc-control-characters,

[gnu-emacs] / lisp / erc / erc.el

diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index e98c9d29baa84cb8d595da31bb2d2035dfcc9548..cadc6fed22262e8a8b36620e87bc515b6d3edfdc 100644 (file)
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -1110,6 +1110,7 @@ which the local user typed."
     (define-key map "\C-c\C-r" 'erc-remove-text-properties-region)
     (define-key map "\C-c\C-t" 'erc-set-topic)
     (define-key map "\C-c\C-u" 'erc-kill-input)
+    (define-key map "\C-c\C-x" 'erc-quit-server)
     (define-key map "\M-\t" 'ispell-complete-word)
     (define-key map "\t" 'erc-complete-word)
 
@@ -1168,7 +1169,8 @@ See the variable `erc-command-indicator'."
   :group 'erc-faces)
 
 (defface erc-notice-face
-  (if (featurep 'xemacs)
+  (if (or (featurep 'xemacs)
+         (< emacs-major-version 22))
       '((t (:bold t :foreground "blue")))
     '((((class color) (min-colors 88))
        (:bold t :foreground "SlateBlue"))
@@ -2426,7 +2428,7 @@ If STRING is nil, the function does nothing."
        (setq list (cdr list))))))
 
 (defvar erc-valid-nick-regexp "[]a-zA-Z^[;\\`_{}|][]^[;\\`_{}|a-zA-Z0-9-]*"
-  "Regexp which matches all legal characters in a IRC nickname.")
+  "Regexp which matches all valid characters in a IRC nickname.")
 
 (defun erc-is-valid-nick-p (nick)
   "Check if NICK is a valid IRC nickname."
@@ -4026,7 +4028,7 @@ and as second argument the event parsed as a vector."
               (string= target (erc-current-nick)))
           (not (erc-get-buffer query proc))
           (not (erc-is-message-ctcp-and-not-action-p msg))
-          (let ((erc-join-buffer erc-auto-query))
+          (let ((erc-query-display erc-auto-query))
             (erc-cmd-QUERY query))
           nil))))
 
@@ -5041,9 +5043,9 @@ each property to the corresponding value in VALUE-LIST."
     (setq value-list (mapcar (lambda (x)
                               t)
                             properties)))
-  (mapcar* (lambda (prop value)
-            (erc-put-text-property start end prop value object))
-          properties value-list))
+  (dotimes (i (min (length properties) (length value-list)))
+    (erc-put-text-property start end (nth i properties)
+                          (nth i value-list) object)))
 
 ;;; Input area handling:
 
@@ -5475,6 +5477,7 @@ If CHANNEL is non-nil, toggle MODE for that channel, otherwise use
   (save-excursion
     (let ((inhibit-read-only t))
       (set-text-properties start end nil object))))
+(put 'erc-remove-text-properties-region 'disabled t)
 
 ;; script execution and startup