aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2007-08-08 07:18:57 +0000
committerGlenn Morris2007-08-08 07:18:57 +0000
commit81bb49ce4624bd4e162f87a26de0576e72ccd88d (patch)
tree1d4038406cc04898b49686904028acb420a4b2e0
parentab2d877d4515f7bb1de1a5b59d24c3d76903a802 (diff)
downloademacs-81bb49ce4624bd4e162f87a26de0576e72ccd88d.tar.gz
emacs-81bb49ce4624bd4e162f87a26de0576e72ccd88d.zip
Replace `iff' in doc-strings and comments.
-rw-r--r--lisp/erc/erc-log.el2
-rw-r--r--lisp/erc/erc.el12
-rw-r--r--lisp/mail/mspools.el2
-rw-r--r--lisp/mail/rmail.el4
-rw-r--r--lisp/mh-e/ChangeLog5
5 files changed, 15 insertions, 10 deletions
diff --git a/lisp/erc/erc-log.el b/lisp/erc/erc-log.el
index 194f8ae6bf1..88132afae0c 100644
--- a/lisp/erc/erc-log.el
+++ b/lisp/erc/erc-log.el
@@ -261,7 +261,7 @@ The current buffer is given by BUFFER."
261 261
262(defun erc-log-all-but-server-buffers (buffer) 262(defun erc-log-all-but-server-buffers (buffer)
263 "Returns t if logging should be enabled in BUFFER. 263 "Returns t if logging should be enabled in BUFFER.
264Returns nil iff `erc-server-buffer-p' returns t." 264Returns nil if `erc-server-buffer-p' returns t."
265 (save-excursion 265 (save-excursion
266 (save-window-excursion 266 (save-window-excursion
267 (set-buffer buffer) 267 (set-buffer buffer)
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index d5a823ac825..c26bdf2a19f 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -3958,7 +3958,7 @@ and always returns t."
3958(defun erc-echo-notice-in-target-buffer (s parsed buffer sender) 3958(defun erc-echo-notice-in-target-buffer (s parsed buffer sender)
3959 "Echos a private notice in BUFFER, if BUFFER is non-nil. This 3959 "Echos a private notice in BUFFER, if BUFFER is non-nil. This
3960function is designed to be added to either `erc-echo-notice-hook' 3960function is designed to be added to either `erc-echo-notice-hook'
3961or `erc-echo-notice-always-hook', and returns non-nil iff BUFFER 3961or `erc-echo-notice-always-hook', and returns non-nil if BUFFER
3962is non-nil." 3962is non-nil."
3963 (if buffer 3963 (if buffer
3964 (progn (erc-display-message parsed nil buffer s) t) 3964 (progn (erc-display-message parsed nil buffer s) t)
@@ -3982,7 +3982,7 @@ designed to be added to either `erc-echo-notice-hook' or
3982 "Echos a private notice in the active buffer if the active 3982 "Echos a private notice in the active buffer if the active
3983buffer is not the server buffer. This function is designed to be 3983buffer is not the server buffer. This function is designed to be
3984added to either `erc-echo-notice-hook' or 3984added to either `erc-echo-notice-hook' or
3985`erc-echo-notice-always-hook', and returns non-nil iff the active 3985`erc-echo-notice-always-hook', and returns non-nil if the active
3986buffer is not the server buffer." 3986buffer is not the server buffer."
3987 (if (not (eq (erc-server-buffer) (erc-active-buffer))) 3987 (if (not (eq (erc-server-buffer) (erc-active-buffer)))
3988 (progn (erc-display-message parsed nil 'active s) t) 3988 (progn (erc-display-message parsed nil 'active s) t)
@@ -3999,7 +3999,7 @@ designed to be added to either `erc-echo-notice-hook' or
3999 "Echos a private notice in all of the buffers for which SENDER 3999 "Echos a private notice in all of the buffers for which SENDER
4000is a member. This function is designed to be added to either 4000is a member. This function is designed to be added to either
4001`erc-echo-notice-hook' or `erc-echo-notice-always-hook', and 4001`erc-echo-notice-hook' or `erc-echo-notice-always-hook', and
4002returns non-nil iff there is at least one buffer for which the 4002returns non-nil if there is at least one buffer for which the
4003sender is a member. 4003sender is a member.
4004 4004
4005See also: `erc-echo-notice-in-first-user-buffer', 4005See also: `erc-echo-notice-in-first-user-buffer',
@@ -4013,7 +4013,7 @@ See also: `erc-echo-notice-in-first-user-buffer',
4013 "Echos a private notice in BUFFER and in all of the buffers for 4013 "Echos a private notice in BUFFER and in all of the buffers for
4014which SENDER is a member. This function is designed to be added 4014which SENDER is a member. This function is designed to be added
4015to either `erc-echo-notice-hook' or 4015to either `erc-echo-notice-hook' or
4016`erc-echo-notice-always-hook', and returns non-nil iff there is 4016`erc-echo-notice-always-hook', and returns non-nil if there is
4017at least one buffer for which the sender is a member or the 4017at least one buffer for which the sender is a member or the
4018default target. 4018default target.
4019 4019
@@ -4029,7 +4029,7 @@ See also: `erc-echo-notice-in-user-buffers',
4029 "Echos a private notice in one of the buffers for which SENDER 4029 "Echos a private notice in one of the buffers for which SENDER
4030is a member. This function is designed to be added to either 4030is a member. This function is designed to be added to either
4031`erc-echo-notice-hook' or `erc-echo-notice-always-hook', and 4031`erc-echo-notice-hook' or `erc-echo-notice-always-hook', and
4032returns non-nil iff there is at least one buffer for which the 4032returns non-nil if there is at least one buffer for which the
4033sender is a member. 4033sender is a member.
4034 4034
4035See also: `erc-echo-notice-in-user-buffers', 4035See also: `erc-echo-notice-in-user-buffers',
@@ -4938,7 +4938,7 @@ Specifically, return the position of `erc-insert-marker'."
4938(defun erc-send-input (input) 4938(defun erc-send-input (input)
4939 "Treat INPUT as typed in by the user. It is assumed that the input 4939 "Treat INPUT as typed in by the user. It is assumed that the input
4940and the prompt is already deleted. 4940and the prompt is already deleted.
4941This returns non-nil only iff we actually send anything." 4941This returns non-nil only if we actually send anything."
4942 ;; Handle different kinds of inputs 4942 ;; Handle different kinds of inputs
4943 (cond 4943 (cond
4944 ;; Ignore empty input 4944 ;; Ignore empty input
diff --git a/lisp/mail/mspools.el b/lisp/mail/mspools.el
index d14be55735f..988ce2f8e02 100644
--- a/lisp/mail/mspools.el
+++ b/lisp/mail/mspools.el
@@ -398,7 +398,7 @@ nil."
398 )) 398 ))
399 399
400(defun mspools-size-folder (spool) 400(defun mspools-size-folder (spool)
401 "Return (SPOOL . SIZE ) iff SIZE of spool file is non-zero." 401 "Return (SPOOL . SIZE ), if SIZE of spool file is non-zero."
402 ;; 7th file attribute is the size of the file in bytes. 402 ;; 7th file attribute is the size of the file in bytes.
403 (let ((file (concat mspools-folder-directory spool)) 403 (let ((file (concat mspools-folder-directory spool))
404 size) 404 size)
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 37a0533acc9..ee990f2fdd3 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -3992,13 +3992,13 @@ specifying headers which should not be copied into the new message."
3992 (mail-position-on-field (if resending "Resent-To" "To") t)))))) 3992 (mail-position-on-field (if resending "Resent-To" "To") t))))))
3993 3993
3994(defun rmail-summary-exists () 3994(defun rmail-summary-exists ()
3995 "Non-nil iff in an RMAIL buffer and an associated summary buffer exists. 3995 "Non-nil if in an RMAIL buffer and an associated summary buffer exists.
3996In fact, the non-nil value returned is the summary buffer itself." 3996In fact, the non-nil value returned is the summary buffer itself."
3997 (and rmail-summary-buffer (buffer-name rmail-summary-buffer) 3997 (and rmail-summary-buffer (buffer-name rmail-summary-buffer)
3998 rmail-summary-buffer)) 3998 rmail-summary-buffer))
3999 3999
4000(defun rmail-summary-displayed () 4000(defun rmail-summary-displayed ()
4001 "t iff in RMAIL buffer and an associated summary buffer is displayed." 4001 "t if in RMAIL buffer and an associated summary buffer is displayed."
4002 (and rmail-summary-buffer (get-buffer-window rmail-summary-buffer))) 4002 (and rmail-summary-buffer (get-buffer-window rmail-summary-buffer)))
4003 4003
4004(defcustom rmail-redisplay-summary nil 4004(defcustom rmail-redisplay-summary nil
diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index 51b3c80f4d5..f8134b0911e 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,3 +1,8 @@
12007-08-08 Glenn Morris <rgm@gnu.org>
2
3 * mh-folder.el, mh-letter.el, mh-show.el: Replace `iff' in
4 doc-strings and comments.
5
12007-07-25 Glenn Morris <rgm@gnu.org> 62007-07-25 Glenn Morris <rgm@gnu.org>
2 7
3 * Relicense all FSF files to GPLv3 or later. 8 * Relicense all FSF files to GPLv3 or later.