aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2007-08-08 07:27:21 +0000
committerGlenn Morris2007-08-08 07:27:21 +0000
commit3ecd3a56c0b0d9453272308be2aae4fca444e9f3 (patch)
tree598e888ff354bd38c9a6e819d200bca004e34229
parentdf26688bd008d27830c166dbc3caccad7e83da0f (diff)
downloademacs-3ecd3a56c0b0d9453272308be2aae4fca444e9f3.tar.gz
emacs-3ecd3a56c0b0d9453272308be2aae4fca444e9f3.zip
Replace `iff' in doc-strings and comments.
-rw-r--r--lisp/gnus/ChangeLog6
-rw-r--r--lisp/international/ja-dic-cnv.el4
-rw-r--r--lisp/international/latin1-disp.el4
-rw-r--r--lisp/international/mule-cmds.el10
-rw-r--r--lisp/international/quail.el2
-rw-r--r--lisp/term/sun-mouse.el2
-rw-r--r--lisp/term/tvi970.el4
-rw-r--r--lisp/textmodes/artist.el2
-rw-r--r--lisp/textmodes/flyspell.el5
-rw-r--r--lisp/textmodes/ispell.el3
-rw-r--r--lisp/textmodes/nroff-mode.el2
-rw-r--r--lisp/textmodes/refill.el2
-rw-r--r--lisp/textmodes/reftex-global.el2
-rw-r--r--lisp/textmodes/sgml-mode.el2
-rw-r--r--lisp/textmodes/two-column.el6
-rw-r--r--lisp/url/url-auth.el2
-rw-r--r--lisp/url/url-cache.el2
-rw-r--r--lisp/url/url-dav.el6
-rw-r--r--lisp/url/url-file.el2
-rw-r--r--lisp/url/vc-dav.el2
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 @@
12007-08-08 Glenn Morris <rgm@gnu.org>
2
3 * gmm-utils.el, gnus-async.el, gnus-msg.el, gnus-score.el
4 * gnus-util.el, imap.el, mailcap.el, nnimap.el: Replace `iff' in
5 doc-strings and comments.
6
12007-07-25 Glenn Morris <rgm@gnu.org> 72007-07-25 Glenn Morris <rgm@gnu.org>
2 8
3 * Relicense all FSF files to GPLv3 or later. 9 * 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 @@
215;; Return t if substring of STR (between FROM and TO) can be broken up 215;; Return t if substring of STR (between FROM and TO) can be broken up
216;; to chunks all of which can be derived from another entry in SKK 216;; to chunks all of which can be derived from another entry in SKK
217;; dictionary. SKKBUF is the buffer where the original SKK dictionary 217;; dictionary. SKKBUF is the buffer where the original SKK dictionary
218;; is visited, KANA is the current entry for STR. FIRST is t iff this 218;; is visited, KANA is the current entry for STR. FIRST is t only if
219;; is called at top level. 219;; this is called at top level.
220 220
221(defun skkdic-breakup-string (skkbuf kana str from to &optional first) 221(defun skkdic-breakup-string (skkbuf kana str from to &optional first)
222 (let ((len (- to from))) 222 (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'."
777 "Set up Latin-1/ASCII display for Unicode characters. 777 "Set up Latin-1/ASCII display for Unicode characters.
778This uses the transliterations of the Lynx browser. 778This uses the transliterations of the Lynx browser.
779 779
780With argument ARG, turn such display on iff ARG is positive, otherwise 780With argument ARG, turn such display on if ARG is positive, otherwise
781turn it off and display Unicode characters literally. The display 781turn it off and display Unicode characters literally. The display
782is't changed if the display can render Unicode characters." 782isn't changed if the display can render Unicode characters."
783 (interactive "p") 783 (interactive "p")
784 (if (> arg 0) 784 (if (> arg 0)
785 (unless (char-displayable-p 785 (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."
445 (let ((base (coding-system-base x))) 445 (let ((base (coding-system-base x)))
446 ;; We calculate the priority number 0..255 by 446 ;; We calculate the priority number 0..255 by
447 ;; using the 8 bits PMMLCEII as this: 447 ;; using the 8 bits PMMLCEII as this:
448 ;; P: 1 iff most preferred. 448 ;; P: 1 if most preferred.
449 ;; MM: greater than 0 iff mime-charset. 449 ;; MM: greater than 0 if mime-charset.
450 ;; L: 1 iff one of the current lang. env.'s codings. 450 ;; L: 1 if one of the current lang. env.'s codings.
451 ;; C: 1 iff one of codings listed in the category list. 451 ;; C: 1 if one of codings listed in the category list.
452 ;; E: 1 iff not XXX-with-esc 452 ;; E: 1 if not XXX-with-esc
453 ;; II: if iso-2022 based, 0..3, else 1. 453 ;; II: if iso-2022 based, 0..3, else 1.
454 (logior 454 (logior
455 (lsh (if (eq base most-preferred) 1 0) 7) 455 (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."
1942 (overlay-put quail-overlay 'face 'highlight)))) 1942 (overlay-put quail-overlay 'face 'highlight))))
1943 1943
1944(defun quail-require-guidance-buf () 1944(defun quail-require-guidance-buf ()
1945 "Return t iff the current Quail package requires showing guidance buffer." 1945 "Return t if the current Quail package requires showing guidance buffer."
1946 (and input-method-verbose-flag 1946 (and input-method-verbose-flag
1947 (if (eq input-method-verbose-flag 'default) 1947 (if (eq input-method-verbose-flag 'default)
1948 (not (and (eq (selected-window) (minibuffer-window)) 1948 (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."
230 230
231 231
232(defun minibuffer-window-p (window) 232(defun minibuffer-window-p (window)
233 "True iff this WINDOW is minibuffer." 233 "True if this WINDOW is minibuffer."
234 (= (frame-height) 234 (= (frame-height)
235 (nth 3 (window-edges window)) ; The bottom edge. 235 (nth 3 (window-edges window)) ; The bottom edge.
236 )) 236 ))
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 @@
106 106
107;;; Should keypad numbers send ordinary digits or distinct escape sequences? 107;;; Should keypad numbers send ordinary digits or distinct escape sequences?
108(defvar tvi970-keypad-numeric nil 108(defvar tvi970-keypad-numeric nil
109 "The terminal should be in numeric keypad mode iff this variable is non-nil. 109 "Non-nil means the terminal should be in numeric keypad mode.
110Do not set this variable! Call the function ``tvi970-set-keypad-mode''.") 110Do not set this variable! Call the function `tvi970-set-keypad-mode'.")
111 111
112(defun tvi970-set-keypad-mode (&optional arg) 112(defun tvi970-set-keypad-mode (&optional arg)
113 "Set the current mode of the TVI 970 numeric keypad. 113 "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."
1768;; Macro that won't funcall the function if it is nil. 1768;; Macro that won't funcall the function if it is nil.
1769;; 1769;;
1770(defmacro artist-funcall (fn &rest args) 1770(defmacro artist-funcall (fn &rest args)
1771 "Call function FN with ARGS iff FN is not nil." 1771 "Call function FN with ARGS, if FN is not nil."
1772 (list 'if fn (cons 'funcall (cons fn args)))) 1772 (list 'if fn (cons 'funcall (cons fn args))))
1773 1773
1774(defun artist-uniq (l) 1774(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'."
457This spawns a single Ispell process and checks each word. 457This spawns a single Ispell process and checks each word.
458The default flyspell behavior is to highlight incorrect words. 458The default flyspell behavior is to highlight incorrect words.
459With no argument, this command toggles Flyspell mode. 459With no argument, this command toggles Flyspell mode.
460With a prefix argument ARG, turn Flyspell minor mode on iff ARG is positive. 460With a prefix argument ARG, turn Flyspell minor mode on if ARG is positive,
461otherwise turn it off.
461 462
462Bindings: 463Bindings:
463\\[ispell-word]: correct words (using Ispell). 464\\[ispell-word]: correct words (using Ispell).
@@ -1621,7 +1622,7 @@ FLYSPELL-BUFFER."
1621;;* flyspell-overlay-p ... */ 1622;;* flyspell-overlay-p ... */
1622;;*---------------------------------------------------------------------*/ 1623;;*---------------------------------------------------------------------*/
1623(defun flyspell-overlay-p (o) 1624(defun flyspell-overlay-p (o)
1624 "A predicate that return true iff O is an overlay used by flyspell." 1625 "Return true if O is an overlay used by flyspell."
1625 (and (overlayp o) (overlay-get o 'flyspell-overlay))) 1626 (and (overlayp o) (overlay-get o 'flyspell-overlay)))
1626 1627
1627;;*---------------------------------------------------------------------*/ 1628;;*---------------------------------------------------------------------*/
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."
3324;;;###autoload 3324;;;###autoload
3325(defun ispell-minor-mode (&optional arg) 3325(defun ispell-minor-mode (&optional arg)
3326 "Toggle Ispell minor mode. 3326 "Toggle Ispell minor mode.
3327With prefix arg, turn Ispell minor mode on iff arg is positive. 3327With prefix argument ARG, turn Ispell minor mode on if ARG is positive,
3328otherwise turn it off.
3328 3329
3329In Ispell minor mode, pressing SPC or RET 3330In Ispell minor mode, pressing SPC or RET
3330warns you if the previous word is incorrectly spelled. 3331warns 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."
261`nroff-electric-newline' forces Emacs to check for an nroff request at the 261`nroff-electric-newline' forces Emacs to check for an nroff request at the
262beginning of the line, and insert the matching closing request if necessary. 262beginning of the line, and insert the matching closing request if necessary.
263This command toggles that mode (off->on, on->off), with an argument, 263This command toggles that mode (off->on, on->off), with an argument,
264turns it on iff arg is positive, otherwise off." 264turns it on if arg is positive, otherwise off."
265 :lighter " Electric" 265 :lighter " Electric"
266 (or (derived-mode-p 'nroff-mode) (error "Must be in nroff mode"))) 266 (or (derived-mode-p 'nroff-mode) (error "Must be in nroff mode")))
267 267
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.")
217;;;###autoload 217;;;###autoload
218(define-minor-mode refill-mode 218(define-minor-mode refill-mode
219 "Toggle Refill minor mode. 219 "Toggle Refill minor mode.
220With prefix arg, turn Refill mode on iff arg is positive. 220With prefix arg, turn Refill mode on if arg is positive, otherwise turn it off.
221 221
222When Refill mode is on, the current paragraph will be formatted when 222When Refill mode is on, the current paragraph will be formatted when
223changes are made within it. Self-inserting characters only cause 223changes 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.
431 431
432With no argument, this command toggles 432With no argument, this command toggles
433`reftex-isearch-minor-mode'. With a prefix argument ARG, turn 433`reftex-isearch-minor-mode'. With a prefix argument ARG, turn
434`reftex-isearch-minor-mode' on iff ARG is positive." 434`reftex-isearch-minor-mode' on if ARG is positive, otherwise turn it off."
435 (interactive "P") 435 (interactive "P")
436 (let ((old-reftex-isearch-minor-mode reftex-isearch-minor-mode)) 436 (let ((old-reftex-isearch-minor-mode reftex-isearch-minor-mode))
437 (setq reftex-isearch-minor-mode 437 (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."
757(defun sgml-skip-tag-forward (arg) 757(defun sgml-skip-tag-forward (arg)
758 "Skip to end of tag or matching closing tag if present. 758 "Skip to end of tag or matching closing tag if present.
759With prefix argument ARG, repeat this ARG times. 759With prefix argument ARG, repeat this ARG times.
760Return t iff after a closing tag." 760Return t if after a closing tag."
761 (interactive "p") 761 (interactive "p")
762 ;; FIXME: Use sgml-get-context or something similar. 762 ;; FIXME: Use sgml-get-context or something similar.
763 ;; It currently might jump to an unrelated </P> if the <P> 763 ;; It currently might jump to an unrelated </P> if the <P>
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]."
561 (newline arg)) 561 (newline arg))
562 562
563(defun 2C-toggle-autoscroll (arg) 563(defun 2C-toggle-autoscroll (arg)
564 "Toggle autoscrolling, or set it iff prefix ARG is non-nil and positive. 564 "Toggle autoscrolling.
565When autoscrolling is turned on, this also realigns the two buffers." 565With prefix argument ARG, turn on autoscrolling if ARG is
566positive, otherwise turn it off. When autoscrolling is turned
567on, this also realigns the two buffers."
566 (interactive "P") 568 (interactive "P")
567 ;(sit-for 0) 569 ;(sit-for 0)
568 (setq 2C-autoscroll-start (window-start)) 570 (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.
310 url-registered-auth-schemes))))) 310 url-registered-auth-schemes)))))
311 311
312(defun url-auth-registered (scheme) 312(defun url-auth-registered (scheme)
313 ;; Return non-nil iff SCHEME is registered as an auth type 313 "Return non-nil if SCHEME is registered as an auth type."
314 (assoc scheme url-registered-auth-schemes)) 314 (assoc scheme url-registered-auth-schemes))
315 315
316(provide 'url-auth) 316(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."
186 186
187;;;###autoload 187;;;###autoload
188(defun url-cache-expired (url mod) 188(defun url-cache-expired (url mod)
189 "Return t iff a cached file has expired." 189 "Return t if a cached file has expired."
190 (let* ((urlobj (if (vectorp url) url (url-generic-parse-url url))) 190 (let* ((urlobj (if (vectorp url) url (url-generic-parse-url url)))
191 (type (url-type urlobj))) 191 (type (url-type urlobj)))
192 (cond 192 (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)."
562 562
563(defun url-dav-unlock-resource (url lock-token) 563(defun url-dav-unlock-resource (url lock-token)
564 "Release the lock on URL represented by LOCK-TOKEN. 564 "Release the lock on URL represented by LOCK-TOKEN.
565Returns t iff the lock was successfully released." 565Returns t if the lock was successfully released."
566 (declare (special url-http-response-status)) 566 (declare (special url-http-response-status))
567 (let* ((url-request-extra-headers (list (cons "Lock-Token" 567 (let* ((url-request-extra-headers (list (cons "Lock-Token"
568 (concat "<" lock-token ">")))) 568 (concat "<" lock-token ">"))))
@@ -654,13 +654,13 @@ Returns t iff the lock was successfully released."
654 (or (plist-get properties 'DAV:getcontentlength) 0) 654 (or (plist-get properties 'DAV:getcontentlength) 0)
655 655
656 ;; file modes as a string like `ls -l' 656 ;; file modes as a string like `ls -l'
657 ;; 657 ;;
658 ;; Should be able to build this up from the 658 ;; Should be able to build this up from the
659 ;; DAV:supportedlock attribute pretty easily. Getting 659 ;; DAV:supportedlock attribute pretty easily. Getting
660 ;; the group info could be impossible though. 660 ;; the group info could be impossible though.
661 (url-dav-file-attributes-mode-string properties) 661 (url-dav-file-attributes-mode-string properties)
662 662
663 ;; t iff file's gid would change if it were deleted & 663 ;; t if file's gid would change if it were deleted &
664 ;; recreated. No way for us to know that thru DAV. 664 ;; recreated. No way for us to know that thru DAV.
665 nil 665 nil
666 666
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."
52 found)) 52 found))
53 53
54(defun url-file-host-is-local-p (host) 54(defun url-file-host-is-local-p (host)
55 "Return t iff HOST references our local machine." 55 "Return t if HOST references our local machine."
56 (let ((case-fold-search t)) 56 (let ((case-fold-search t))
57 (or 57 (or
58 (null host) 58 (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 @@
31 31
32;;; Required functions for a vc backend 32;;; Required functions for a vc backend
33(defun vc-dav-registered (url) 33(defun vc-dav-registered (url)
34 "Return t iff URL is registered with a DAV aware server." 34 "Return t if URL is registered with a DAV aware server."
35 (url-dav-vc-registered url)) 35 (url-dav-vc-registered url))
36 36
37(defun vc-dav-state (url) 37(defun vc-dav-state (url)