[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Erc-commit] [commit][emacs22] Sync from Emacs trunk
From: |
mwolson |
Subject: |
[Erc-commit] [commit][emacs22] Sync from Emacs trunk |
Date: |
Sun, 14 Oct 2007 00:49:12 -0400 |
commit 962ea2227ac72788ec37258aeee910f1f6d3467c
Author: Michael W. Olson <address@hidden>
Date: Fri Sep 7 22:08:16 2007 -0400
Sync from Emacs trunk
diff --git a/ChangeLog b/ChangeLog
index 4576992..1d8c1c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-09-07 Glenn Morris <address@hidden>
+
+ * erc.el (erc-toggle-debug-irc-protocol): Fix call to
+ erc-view-mode-enter.
+
+2007-08-08 Glenn Morris <address@hidden>
+
+ * erc-log.el, erc.el: Replace `iff' in doc-strings and comments.
+
2007-07-30 Michael Olson <address@hidden>
* erc-nicklist.el: Remove from the Emacs source tree. This file
diff --git a/erc-log.el b/erc-log.el
index e0f5669..856f1dc 100644
--- a/erc-log.el
+++ b/erc-log.el
@@ -280,7 +280,7 @@ The current buffer is given by BUFFER."
(defun erc-log-all-but-server-buffers (buffer)
"Returns t if logging should be enabled in BUFFER.
-Returns nil iff `erc-server-buffer-p' returns t."
+Returns nil if `erc-server-buffer-p' returns t."
(save-excursion
(save-window-excursion
(set-buffer buffer)
diff --git a/erc.el b/erc.el
index fc7ad12..8cfafd7 100644
--- a/erc.el
+++ b/erc.el
@@ -4006,7 +4006,7 @@ and always returns t."
(defun erc-echo-notice-in-target-buffer (s parsed buffer sender)
"Echos a private notice in BUFFER, if BUFFER is non-nil. This
function is designed to be added to either `erc-echo-notice-hook'
-or `erc-echo-notice-always-hook', and returns non-nil iff BUFFER
+or `erc-echo-notice-always-hook', and returns non-nil if BUFFER
is non-nil."
(if buffer
(progn (erc-display-message parsed nil buffer s) t)
@@ -4030,7 +4030,7 @@ designed to be added to either `erc-echo-notice-hook' or
"Echos a private notice in the active buffer if the active
buffer is not the server buffer. This function is designed to be
added to either `erc-echo-notice-hook' or
-`erc-echo-notice-always-hook', and returns non-nil iff the active
+`erc-echo-notice-always-hook', and returns non-nil if the active
buffer is not the server buffer."
(if (not (eq (erc-server-buffer) (erc-active-buffer)))
(progn (erc-display-message parsed nil 'active s) t)
@@ -4047,7 +4047,7 @@ designed to be added to either `erc-echo-notice-hook' or
"Echos a private notice in all of the buffers for which SENDER
is a member. This function is designed to be added to either
`erc-echo-notice-hook' or `erc-echo-notice-always-hook', and
-returns non-nil iff there is at least one buffer for which the
+returns non-nil if there is at least one buffer for which the
sender is a member.
See also: `erc-echo-notice-in-first-user-buffer',
@@ -4061,7 +4061,7 @@ See also: `erc-echo-notice-in-first-user-buffer',
"Echos a private notice in BUFFER and in all of the buffers for
which SENDER is a member. This function is designed to be added
to either `erc-echo-notice-hook' or
-`erc-echo-notice-always-hook', and returns non-nil iff there is
+`erc-echo-notice-always-hook', and returns non-nil if there is
at least one buffer for which the sender is a member or the
default target.
@@ -4077,7 +4077,7 @@ See also: `erc-echo-notice-in-user-buffers',
"Echos a private notice in one of the buffers for which SENDER
is a member. This function is designed to be added to either
`erc-echo-notice-hook' or `erc-echo-notice-always-hook', and
-returns non-nil iff there is at least one buffer for which the
+returns non-nil if there is at least one buffer for which the
sender is a member.
See also: `erc-echo-notice-in-user-buffers',
@@ -5015,7 +5015,7 @@ Specifically, return the position of `erc-insert-marker'."
(defun erc-send-input (input)
"Treat INPUT as typed in by the user. It is assumed that the input
and the prompt is already deleted.
-This returns non-nil only iff we actually send anything."
+This returns non-nil only if we actually send anything."
;; Handle different kinds of inputs
(cond
;; Ignore empty input
diff --git a/erc.texi b/erc.texi
index 6b78347..e4f1f85 100644
--- a/erc.texi
+++ b/erc.texi
@@ -1,6 +1,6 @@
\input texinfo
@c %**start of header
address@hidden ../info/erc
address@hidden ../../info/erc
@settitle ERC Manual
@c %**end of header
- [Erc-commit] [commit][emacs22] Sync from Emacs trunk,
mwolson <=