summaryrefslogtreecommitdiff
path: root/lisp/erc
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/erc')
-rw-r--r--lisp/erc/ChangeLog7
-rw-r--r--lisp/erc/erc-goodies.el2
2 files changed, 5 insertions, 4 deletions
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index ead40c1e01e..ee4eb753926 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -2,13 +2,14 @@
* Relicense all FSF files to GPLv3 or later.
-2007-06-07 Juanma Barranquero <lekktu@gmail.com>
+2007-06-14 Juanma Barranquero <lekktu@gmail.com>
- * erc.el (erc-startup-file-list): Fix typo in docstring.
+ * erc-goodies.el (erc-scroll-to-bottom): Remove redundant check.
2007-06-06 Juanma Barranquero <lekktu@gmail.com>
- * erc.el (erc-show-channel-key-p): Fix typo in docstring.
+ * erc.el (erc-show-channel-key-p, erc-startup-file-list):
+ Fix typo in docstring.
2007-04-01 Michael Olson <mwolson@gnu.org>
diff --git a/lisp/erc/erc-goodies.el b/lisp/erc/erc-goodies.el
index 7d995ebb7bb..49a04513733 100644
--- a/lisp/erc/erc-goodies.el
+++ b/lisp/erc/erc-goodies.el
@@ -77,7 +77,7 @@ You can control which line is recentered to by customizing the
variable `erc-input-line-position'.
DISPLAY-START is ignored."
- (if (and window (window-live-p window))
+ (if (window-live-p window)
;; Temporarily bind resize-mini-windows to nil so that users who have it
;; set to a non-nil value will not suffer from premature minibuffer
;; shrinkage due to the below recenter call. I have no idea why this