[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Erc-commit] [commit][emacs22] Merge from emacs22 (manually)
From: |
mwolson |
Subject: |
[Erc-commit] [commit][emacs22] Merge from emacs22 (manually) |
Date: |
Sun, 14 Oct 2007 00:49:11 -0400 |
commit 9e2c66bef12240661f225a22deca116ff5cab536
Author: Michael W. Olson <address@hidden>
Date: Sun Sep 2 22:25:21 2007 -0400
Merge from emacs22 (manually)
diff --git a/ChangeLog b/ChangeLog
index f62931f..0a1e009 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,7 +26,7 @@
(erc-track-get-active-buffer): Make 'oldest a rough opposite of
'importance.
-2007-08-14 Jeremy Maitin-Shepard <address@hidden>
+2007-08-14 Jeremy Maitin-Shepard <address@hidden>
* erc-track.el (erc-track-remove-disconnected-buffers): New
variable which controls whether buffers associated with a server
@@ -176,6 +176,10 @@
* erc-pkg.el: Update description to match what is currently in
ELPA.
+2007-06-14 Juanma Barranquero <address@hidden>
+
+ * erc-goodies.el (erc-scroll-to-bottom): Remove redundant check.
+
2007-06-13 Michael Olson <address@hidden>
* erc-compat.el (erc-with-selected-window): New compatibility
@@ -190,6 +194,11 @@
* erc-log.el (erc-logging-enabled): Fix a bug that occurred when
`erc-log-channels-directory' had the name of a function.
+2007-06-06 Juanma Barranquero <address@hidden>
+
+ * erc.el (erc-show-channel-key-p, erc-startup-file-list):
+ Fix typo in docstring.
+
2007-06-03 Michael Olson <address@hidden>
* erc-compat.el (erc-view-mode-enter): Make this its own function,
diff --git a/erc-goodies.el b/erc-goodies.el
index c92c33d..9131ce6 100644
--- a/erc-goodies.el
+++ b/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
diff --git a/erc.el b/erc.el
index 325e2d9..f14ea52 100644
--- a/erc.el
+++ b/erc.el
@@ -843,7 +843,7 @@ See `erc-server-flood-margin' for other flood-related
parameters.")
The first existent and readable one will get executed.
If the filename ends with `.el' it is presumed to be an Emacs Lisp
-script and it gets (load)ed. Otherwise is is treated as a bunch of
+script and it gets (load)ed. Otherwise it is treated as a bunch of
regular IRC commands."
:group 'erc-scripts
:type '(repeat file))
@@ -5861,7 +5861,7 @@ Otherwise, use the `erc-header-line' face."
(function :tag "Call a function")))
(defcustom erc-show-channel-key-p t
- "Show the the channel key in the header line."
+ "Show the channel key in the header line."
:group 'erc-paranoia
:type 'boolean)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Erc-commit] [commit][emacs22] Merge from emacs22 (manually),
mwolson <=