From 3ecd3a56c0b0d9453272308be2aae4fca444e9f3 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 8 Aug 2007 07:27:21 +0000 Subject: [PATCH] Replace `iff' in doc-strings and comments. --- lisp/gnus/ChangeLog | 6 ++++++ lisp/international/ja-dic-cnv.el | 4 ++-- lisp/international/latin1-disp.el | 4 ++-- lisp/international/mule-cmds.el | 10 +++++----- lisp/international/quail.el | 2 +- lisp/term/sun-mouse.el | 2 +- lisp/term/tvi970.el | 4 ++-- lisp/textmodes/artist.el | 2 +- lisp/textmodes/flyspell.el | 5 +++-- lisp/textmodes/ispell.el | 3 ++- lisp/textmodes/nroff-mode.el | 2 +- lisp/textmodes/refill.el | 2 +- lisp/textmodes/reftex-global.el | 2 +- lisp/textmodes/sgml-mode.el | 2 +- lisp/textmodes/two-column.el | 6 ++++-- lisp/url/url-auth.el | 2 +- lisp/url/url-cache.el | 2 +- lisp/url/url-dav.el | 6 +++--- lisp/url/url-file.el | 2 +- lisp/url/vc-dav.el | 2 +- 20 files changed, 40 insertions(+), 30 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 83ca62ca0de..807a853ba56 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,9 @@ +2007-08-08 Glenn Morris + + * gmm-utils.el, gnus-async.el, gnus-msg.el, gnus-score.el + * gnus-util.el, imap.el, mailcap.el, nnimap.el: Replace `iff' in + doc-strings and comments. + 2007-07-25 Glenn Morris * Relicense all FSF files to GPLv3 or later. diff --git a/lisp/international/ja-dic-cnv.el b/lisp/international/ja-dic-cnv.el index 5fa18221327..e7c9b633b3b 100644 --- a/lisp/international/ja-dic-cnv.el +++ b/lisp/international/ja-dic-cnv.el @@ -215,8 +215,8 @@ ;; Return t if substring of STR (between FROM and TO) can be broken up ;; to chunks all of which can be derived from another entry in SKK ;; dictionary. SKKBUF is the buffer where the original SKK dictionary -;; is visited, KANA is the current entry for STR. FIRST is t iff this -;; is called at top level. +;; is visited, KANA is the current entry for STR. FIRST is t only if +;; this is called at top level. (defun skkdic-breakup-string (skkbuf kana str from to &optional first) (let ((len (- to from))) diff --git a/lisp/international/latin1-disp.el b/lisp/international/latin1-disp.el index 515695bf503..ebeef71b0b7 100644 --- a/lisp/international/latin1-disp.el +++ b/lisp/international/latin1-disp.el @@ -777,9 +777,9 @@ use either \\[customize] or the function `latin1-display'." "Set up Latin-1/ASCII display for Unicode characters. This uses the transliterations of the Lynx browser. -With argument ARG, turn such display on iff ARG is positive, otherwise +With argument ARG, turn such display on if ARG is positive, otherwise turn it off and display Unicode characters literally. The display -is't changed if the display can render Unicode characters." +isn't changed if the display can render Unicode characters." (interactive "p") (if (> arg 0) (unless (char-displayable-p diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el index 9501d5f7cc0..a858066f47c 100644 --- a/lisp/international/mule-cmds.el +++ b/lisp/international/mule-cmds.el @@ -445,11 +445,11 @@ non-nil, it is used to sort CODINGS instead." (let ((base (coding-system-base x))) ;; We calculate the priority number 0..255 by ;; using the 8 bits PMMLCEII as this: - ;; P: 1 iff most preferred. - ;; MM: greater than 0 iff mime-charset. - ;; L: 1 iff one of the current lang. env.'s codings. - ;; C: 1 iff one of codings listed in the category list. - ;; E: 1 iff not XXX-with-esc + ;; P: 1 if most preferred. + ;; MM: greater than 0 if mime-charset. + ;; L: 1 if one of the current lang. env.'s codings. + ;; C: 1 if one of codings listed in the category list. + ;; E: 1 if not XXX-with-esc ;; II: if iso-2022 based, 0..3, else 1. (logior (lsh (if (eq base most-preferred) 1 0) 7) diff --git a/lisp/international/quail.el b/lisp/international/quail.el index 774e3c14269..f9f497699a0 100644 --- a/lisp/international/quail.el +++ b/lisp/international/quail.el @@ -1942,7 +1942,7 @@ Remaining args are for FUNC." (overlay-put quail-overlay 'face 'highlight)))) (defun quail-require-guidance-buf () - "Return t iff the current Quail package requires showing guidance buffer." + "Return t if the current Quail package requires showing guidance buffer." (and input-method-verbose-flag (if (eq input-method-verbose-flag 'default) (not (and (eq (selected-window) (minibuffer-window)) diff --git a/lisp/term/sun-mouse.el b/lisp/term/sun-mouse.el index 280bfb67081..65ebe193c71 100644 --- a/lisp/term/sun-mouse.el +++ b/lisp/term/sun-mouse.el @@ -230,7 +230,7 @@ Handles wrapped and horizontally scrolled lines correctly." (defun minibuffer-window-p (window) - "True iff this WINDOW is minibuffer." + "True if this WINDOW is minibuffer." (= (frame-height) (nth 3 (window-edges window)) ; The bottom edge. )) diff --git a/lisp/term/tvi970.el b/lisp/term/tvi970.el index 4af21f08522..1c0bda519ac 100644 --- a/lisp/term/tvi970.el +++ b/lisp/term/tvi970.el @@ -106,8 +106,8 @@ ;;; Should keypad numbers send ordinary digits or distinct escape sequences? (defvar tvi970-keypad-numeric nil - "The terminal should be in numeric keypad mode iff this variable is non-nil. -Do not set this variable! Call the function ``tvi970-set-keypad-mode''.") + "Non-nil means the terminal should be in numeric keypad mode. +Do not set this variable! Call the function `tvi970-set-keypad-mode'.") (defun tvi970-set-keypad-mode (&optional arg) "Set the current mode of the TVI 970 numeric keypad. diff --git a/lisp/textmodes/artist.el b/lisp/textmodes/artist.el index dbb41f13ec0..274de28e6a0 100644 --- a/lisp/textmodes/artist.el +++ b/lisp/textmodes/artist.el @@ -1768,7 +1768,7 @@ info-variant-part." ;; Macro that won't funcall the function if it is nil. ;; (defmacro artist-funcall (fn &rest args) - "Call function FN with ARGS iff FN is not nil." + "Call function FN with ARGS, if FN is not nil." (list 'if fn (cons 'funcall (cons fn args)))) (defun artist-uniq (l) diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el index 8b95a159477..0b5dfa4cc54 100644 --- a/lisp/textmodes/flyspell.el +++ b/lisp/textmodes/flyspell.el @@ -457,7 +457,8 @@ See also `flyspell-duplicate-distance'." This spawns a single Ispell process and checks each word. The default flyspell behavior is to highlight incorrect words. With no argument, this command toggles Flyspell mode. -With a prefix argument ARG, turn Flyspell minor mode on iff ARG is positive. +With a prefix argument ARG, turn Flyspell minor mode on if ARG is positive, +otherwise turn it off. Bindings: \\[ispell-word]: correct words (using Ispell). @@ -1621,7 +1622,7 @@ FLYSPELL-BUFFER." ;;* flyspell-overlay-p ... */ ;;*---------------------------------------------------------------------*/ (defun flyspell-overlay-p (o) - "A predicate that return true iff O is an overlay used by flyspell." + "Return true if O is an overlay used by flyspell." (and (overlayp o) (overlay-get o 'flyspell-overlay))) ;;*---------------------------------------------------------------------*/ diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el index 047fb141331..3d6a17c5d93 100644 --- a/lisp/textmodes/ispell.el +++ b/lisp/textmodes/ispell.el @@ -3324,7 +3324,8 @@ available on the net." ;;;###autoload (defun ispell-minor-mode (&optional arg) "Toggle Ispell minor mode. -With prefix arg, turn Ispell minor mode on iff arg is positive. +With prefix argument ARG, turn Ispell minor mode on if ARG is positive, +otherwise turn it off. In Ispell minor mode, pressing SPC or RET warns you if the previous word is incorrectly spelled. diff --git a/lisp/textmodes/nroff-mode.el b/lisp/textmodes/nroff-mode.el index a96d4845857..18156071e1c 100644 --- a/lisp/textmodes/nroff-mode.el +++ b/lisp/textmodes/nroff-mode.el @@ -261,7 +261,7 @@ automatically inserts the matching closing request after point." `nroff-electric-newline' forces Emacs to check for an nroff request at the beginning of the line, and insert the matching closing request if necessary. This command toggles that mode (off->on, on->off), with an argument, -turns it on iff arg is positive, otherwise off." +turns it on if arg is positive, otherwise off." :lighter " Electric" (or (derived-mode-p 'nroff-mode) (error "Must be in nroff mode"))) diff --git a/lisp/textmodes/refill.el b/lisp/textmodes/refill.el index a20a482a1c9..3717faa8ad2 100644 --- a/lisp/textmodes/refill.el +++ b/lisp/textmodes/refill.el @@ -217,7 +217,7 @@ complex processing.") ;;;###autoload (define-minor-mode refill-mode "Toggle Refill minor mode. -With prefix arg, turn Refill mode on iff arg is positive. +With prefix arg, turn Refill mode on if arg is positive, otherwise turn it off. When Refill mode is on, the current paragraph will be formatted when changes are made within it. Self-inserting characters only cause diff --git a/lisp/textmodes/reftex-global.el b/lisp/textmodes/reftex-global.el index c551083240c..2a39949431c 100644 --- a/lisp/textmodes/reftex-global.el +++ b/lisp/textmodes/reftex-global.el @@ -431,7 +431,7 @@ the current TeX document. With no argument, this command toggles `reftex-isearch-minor-mode'. With a prefix argument ARG, turn -`reftex-isearch-minor-mode' on iff ARG is positive." +`reftex-isearch-minor-mode' on if ARG is positive, otherwise turn it off." (interactive "P") (let ((old-reftex-isearch-minor-mode reftex-isearch-minor-mode)) (setq reftex-isearch-minor-mode diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el index 1c81a1e7028..9da49fcc599 100644 --- a/lisp/textmodes/sgml-mode.el +++ b/lisp/textmodes/sgml-mode.el @@ -757,7 +757,7 @@ With prefix argument ARG, repeat this ARG times." (defun sgml-skip-tag-forward (arg) "Skip to end of tag or matching closing tag if present. With prefix argument ARG, repeat this ARG times. -Return t iff after a closing tag." +Return t if after a closing tag." (interactive "p") ;; FIXME: Use sgml-get-context or something similar. ;; It currently might jump to an unrelated

if the

diff --git a/lisp/textmodes/two-column.el b/lisp/textmodes/two-column.el index eebd1923b63..e1f55c0dece 100644 --- a/lisp/textmodes/two-column.el +++ b/lisp/textmodes/two-column.el @@ -561,8 +561,10 @@ off trailing spaces with \\[delete-trailing-whitespace]." (newline arg)) (defun 2C-toggle-autoscroll (arg) - "Toggle autoscrolling, or set it iff prefix ARG is non-nil and positive. -When autoscrolling is turned on, this also realigns the two buffers." + "Toggle autoscrolling. +With prefix argument ARG, turn on autoscrolling if ARG is +positive, otherwise turn it off. When autoscrolling is turned +on, this also realigns the two buffers." (interactive "P") ;(sit-for 0) (setq 2C-autoscroll-start (window-start)) diff --git a/lisp/url/url-auth.el b/lisp/url/url-auth.el index c57a96cc81b..030409c3391 100644 --- a/lisp/url/url-auth.el +++ b/lisp/url/url-auth.el @@ -310,7 +310,7 @@ RATING a rating between 1 and 10 of the strength of the authentication. url-registered-auth-schemes))))) (defun url-auth-registered (scheme) - ;; Return non-nil iff SCHEME is registered as an auth type + "Return non-nil if SCHEME is registered as an auth type." (assoc scheme url-registered-auth-schemes)) (provide 'url-auth) diff --git a/lisp/url/url-cache.el b/lisp/url/url-cache.el index 8fbe01d472a..6db30eacda9 100644 --- a/lisp/url/url-cache.el +++ b/lisp/url/url-cache.el @@ -186,7 +186,7 @@ Very fast if you have an `md5' primitive function, suitably fast otherwise." ;;;###autoload (defun url-cache-expired (url mod) - "Return t iff a cached file has expired." + "Return t if a cached file has expired." (let* ((urlobj (if (vectorp url) url (url-generic-parse-url url))) (type (url-type urlobj))) (cond diff --git a/lisp/url/url-dav.el b/lisp/url/url-dav.el index afae0041b68..b58c1672865 100644 --- a/lisp/url/url-dav.el +++ b/lisp/url/url-dav.el @@ -562,7 +562,7 @@ FAILURE-RESULTS is a list of (URL STATUS)." (defun url-dav-unlock-resource (url lock-token) "Release the lock on URL represented by LOCK-TOKEN. -Returns t iff the lock was successfully released." +Returns t if the lock was successfully released." (declare (special url-http-response-status)) (let* ((url-request-extra-headers (list (cons "Lock-Token" (concat "<" lock-token ">")))) @@ -654,13 +654,13 @@ Returns t iff the lock was successfully released." (or (plist-get properties 'DAV:getcontentlength) 0) ;; file modes as a string like `ls -l' - ;; + ;; ;; Should be able to build this up from the ;; DAV:supportedlock attribute pretty easily. Getting ;; the group info could be impossible though. (url-dav-file-attributes-mode-string properties) - ;; t iff file's gid would change if it were deleted & + ;; t if file's gid would change if it were deleted & ;; recreated. No way for us to know that thru DAV. nil diff --git a/lisp/url/url-file.el b/lisp/url/url-file.el index e899493f1ce..6e771c9cd69 100644 --- a/lisp/url/url-file.el +++ b/lisp/url/url-file.el @@ -52,7 +52,7 @@ to them." found)) (defun url-file-host-is-local-p (host) - "Return t iff HOST references our local machine." + "Return t if HOST references our local machine." (let ((case-fold-search t)) (or (null host) diff --git a/lisp/url/vc-dav.el b/lisp/url/vc-dav.el index ce0d3275a5f..7e9b6606ca4 100644 --- a/lisp/url/vc-dav.el +++ b/lisp/url/vc-dav.el @@ -31,7 +31,7 @@ ;;; Required functions for a vc backend (defun vc-dav-registered (url) - "Return t iff URL is registered with a DAV aware server." + "Return t if URL is registered with a DAV aware server." (url-dav-vc-registered url)) (defun vc-dav-state (url) -- 2.39.2