[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Erc-commit] [commit][master] Sync message and error string fixes from E
From: |
mwolson |
Subject: |
[Erc-commit] [commit][master] Sync message and error string fixes from Emacs |
Date: |
Sun, 09 Dec 2007 02:00:18 -0500 |
commit 170e591d30e04425dac5b1c56a7771eb6bed533b
Author: Michael W. Olson <address@hidden>
Date: Sat Dec 8 21:53:07 2007 -0500
Sync message and error string fixes from Emacs
diff --git a/ChangeLog b/ChangeLog
index e9f8754..bbda56c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,12 @@
* erc-backend.el, erc.el:
Parse 275 (secure connection) responses.
+2007-12-08 David Kastrup <address@hidden>
+
+ * erc-stamp.el (erc-echo-timestamp):
+ * erc-lang.el (language):
+ * erc-backend.el (erc-server-connect): Fix buggy call to `message'.
+
2007-12-07 Edward O'Connor <address@hidden>
* erc-services.el: Provide a hook that runs when nickserv confirms
@@ -15,6 +21,10 @@
(erc-nickserv-identification-autodetect): New functions.
(erc-nickserv-identified-hook): New hook.
+2007-12-06 D. Goel <address@hidden>
+
+ * erc-match.el (erc-add-entry-to-list): Fix buggy call to `error'.
+
2007-12-01 Glenn Morris <address@hidden>
* erc-backend.el (erc-server-send-ping): Move after definition of
diff --git a/erc-backend.el b/erc-backend.el
index 2117163..5d94408 100644
--- a/erc-backend.el
+++ b/erc-backend.el
@@ -515,7 +515,7 @@ We will store server variables in the buffer given by
BUFFER."
(set-process-filter process 'erc-server-filter-function)
(set-process-buffer process buffer)))
(erc-log "\n\n\n********************************************\n")
- (message (erc-format-message
+ (message "%s" (erc-format-message
'login ?n
(with-current-buffer buffer (erc-current-nick))))
;; wait with script loading until we receive a confirmation (first
diff --git a/erc-lang.el b/erc-lang.el
index e61156f..b11721d 100644
--- a/erc-lang.el
+++ b/erc-lang.el
@@ -197,7 +197,7 @@ Normungsinstitut (ON), Postfach 130, A-1021 Vienna,
Austria.")
"Return the language name for the ISO CODE."
(interactive (list (completing-read "ISO language code: "
iso-638-languages)))
- (message (cdr (assoc code iso-638-languages))))
+ (message "%s" (cdr (assoc code iso-638-languages))))
(defun erc-cmd-LANG (language)
"Display the language name for the language code given by LANGUAGE."
diff --git a/erc-match.el b/erc-match.el
index a475258..757ef66 100644
--- a/erc-match.el
+++ b/erc-match.el
@@ -299,7 +299,7 @@ Completion is performed on the optional alist COMPLETIONS."
(lambda (x)
(not (erc-member-ignore-case (car x) (symbol-value list)))))))
(if (erc-member-ignore-case entry (symbol-value list))
- (error (format "\"%s\" is already on the list" entry))
+ (error "\"%s\" is already on the list" entry)
(set list (cons entry (symbol-value list))))))
(defun erc-remove-entry-from-list (list prompt)
diff --git a/erc-stamp.el b/erc-stamp.el
index 64b0405..ae9bb51 100644
--- a/erc-stamp.el
+++ b/erc-stamp.el
@@ -412,8 +412,8 @@ NOW is position of point currently."
(when erc-echo-timestamps
(let ((stamp (get-text-property now 'timestamp)))
(when stamp
- (message (format-time-string erc-echo-timestamp-format
- stamp))))))
+ (message "%s" (format-time-string erc-echo-timestamp-format
+ stamp))))))
(provide 'erc-stamp)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Erc-commit] [commit][master] Sync message and error string fixes from Emacs,
mwolson <=