summaryrefslogtreecommitdiff
path: root/lisp/erc
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/erc')
-rw-r--r--lisp/erc/ChangeLog4
-rw-r--r--lisp/erc/ChangeLog.012
-rw-r--r--lisp/erc/ChangeLog.034
-rw-r--r--lisp/erc/erc-backend.el2
-rw-r--r--lisp/erc/erc-log.el2
5 files changed, 9 insertions, 5 deletions
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 9a029893352..3fd2c87d59c 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,7 @@
+2011-11-20 Juanma Barranquero <lekktu@gmail.com>
+
+ * erc-log.el (erc-logging-enabled): Fix typo.
+
2011-11-14 Juanma Barranquero <lekktu@gmail.com>
* erc-notify.el (erc-notify-interval, erc-cmd-NOTIFY): Fix typos.
diff --git a/lisp/erc/ChangeLog.01 b/lisp/erc/ChangeLog.01
index 001ab42926f..f4e10d05981 100644
--- a/lisp/erc/ChangeLog.01
+++ b/lisp/erc/ChangeLog.01
@@ -399,7 +399,7 @@
* erc.el: * Tijs van Bakel's work from 10th Nov. merged in
* My additions to that idea merged in too
- Basicly, this is a major rewrite, if you are scared and want avoid problems,
+ Basically, this is a major rewrite, if you are scared and want avoid problems,
stay at your current version. It seems fairly stable though.
That changed? erc-buffer-name handling was completely rewritten,
and erc-buffer-list local variable handling removed.
diff --git a/lisp/erc/ChangeLog.03 b/lisp/erc/ChangeLog.03
index 322f7c93f7d..fc7fd09e76c 100644
--- a/lisp/erc/ChangeLog.03
+++ b/lisp/erc/ChangeLog.03
@@ -838,7 +838,7 @@
* erc.el:
erc-log-channels: removed; set the directory to start logging
(erc-directory-writeable-p): create directory if it doesn't exist, check if
- it's writeable
+ it's writable
(erc-logging-enabled): don't reference erc-log-channels
2003-04-07 Damien Elmes <erc@repose.cx>
@@ -1556,7 +1556,7 @@
* erc.el: This is the "everything is suddenly broken!" release
You know, this is CVS, you can still go back, and wait until the transition
- is finished, but here is patch one, which basicly breaks every command
+ is finished, but here is patch one, which basically breaks every command
which is typed on the prompt.
Hit me, we can still revert, but something needs to be done about this.
* (erc-extract-command-from-line): intern-soft the function here.
diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el
index f86c9ef845a..5baa676ab39 100644
--- a/lisp/erc/erc-backend.el
+++ b/lisp/erc/erc-backend.el
@@ -1432,7 +1432,7 @@ add things to `%s' instead."
(when (string= cmd "PRIVMSG")
(erc-auto-query proc parsed))))))
-;; FIXME: need clean way of specifiying extra hooks in
+;; FIXME: need clean way of specifying extra hooks in
;; define-erc-response-handler.
(add-hook 'erc-server-PRIVMSG-functions 'erc-auto-query)
diff --git a/lisp/erc/erc-log.el b/lisp/erc/erc-log.el
index c6b0984fe67..f1754afd1ac 100644
--- a/lisp/erc/erc-log.el
+++ b/lisp/erc/erc-log.el
@@ -314,7 +314,7 @@ Returns nil if `erc-server-buffer-p' returns t."
"Return non-nil if logging is enabled for BUFFER.
If BUFFER is nil, the value of `current-buffer' is used.
Logging is enabled if `erc-log-channels-directory' is non-nil, the directory
-is writeable (it will be created as necessary) and
+is writable (it will be created as necessary) and
`erc-enable-logging' returns a non-nil value."
(and erc-log-channels-directory
(or (functionp erc-log-channels-directory)