# HG changeset patch # User Glenn Morris # Date 1186558271 0 # Node ID 419c5c316b51353e6f1d6fbd819a9bb2e3e45366 # Parent f0a07da7dd455d40eb6c8eb7da133e7eada45805 Replace `iff' in doc-strings and comments. diff -r f0a07da7dd45 -r 419c5c316b51 lisp/progmodes/antlr-mode.el --- a/lisp/progmodes/antlr-mode.el Wed Aug 08 07:27:37 2007 +0000 +++ b/lisp/progmodes/antlr-mode.el Wed Aug 08 07:31:11 2007 +0000 @@ -568,7 +568,7 @@ general value, or `antlr-read-boolean' with ARGs = \(PROMPT TABLE) which reads a boolean value or a member of TABLE. PROMPT is the prompt when asking for a new value. If non-nil, TABLE is a table for completion or -a function evaluating to such a table. The return value is quoted iff +a function evaluating to such a table. The return value is quoted if AS-STRING is non-nil and is either t or a symbol which is a member of `antlr-options-style'.") @@ -2203,8 +2203,8 @@ part \(CLASS-SPEC ...) in the result of `antlr-directory-dependencies'. The result looks like \(OPTION WITH-UNKNOWN GLIB ...). OPTION is the -complete \"-glib\" option. WITH-UNKNOWN has value t iff there is none -or more than one grammar file for at least one super grammar. +complete \"-glib\" option. WITH-UNKNOWN is t if there is none or more +than one grammar file for at least one super grammar. Each GLIB looks like \(GRAMMAR-FILE \. EVOCAB). GRAMMAR-FILE is a file in which a super-grammar is defined. EVOCAB is the value of the export diff -r f0a07da7dd45 -r 419c5c316b51 lisp/progmodes/cc-awk.el --- a/lisp/progmodes/cc-awk.el Wed Aug 08 07:27:37 2007 +0000 +++ b/lisp/progmodes/cc-awk.el Wed Aug 08 07:31:11 2007 +0000 @@ -478,7 +478,7 @@ (defun c-awk-get-NL-prop-prev-line (&optional do-lim) ;; Get the c-awk-NL-prop text-property from the previous line, calculating - ;; it if necessary. Return nil iff we're already at BOB. + ;; it if necessary. Return nil if we're at BOB. ;; See c-awk-after-if-for-while-condition-p for a description of DO-LIM. ;; ;; This function might do hidden buffer changes. diff -r f0a07da7dd45 -r 419c5c316b51 lisp/progmodes/cc-engine.el --- a/lisp/progmodes/cc-engine.el Wed Aug 08 07:27:37 2007 +0000 +++ b/lisp/progmodes/cc-engine.el Wed Aug 08 07:31:11 2007 +0000 @@ -5116,7 +5116,7 @@ ;; Foo::Foo (int b) : Base (b) {} ;; car ^ ^ point ;; - ;; The cdr of the return value is non-nil iff a + ;; The cdr of the return value is non-nil if a ;; `c-typedef-decl-kwds' specifier is found in the declaration, ;; i.e. the declared identifier(s) are types. ;; diff -r f0a07da7dd45 -r 419c5c316b51 lisp/progmodes/cc-vars.el --- a/lisp/progmodes/cc-vars.el Wed Aug 08 07:27:37 2007 +0000 +++ b/lisp/progmodes/cc-vars.el Wed Aug 08 07:31:11 2007 +0000 @@ -186,7 +186,7 @@ (bq-process type))))))))) (defun c-valid-offset (offset) - "Return non-nil iff OFFSET is a valid offset for a syntactic symbol. + "Return non-nil if OFFSET is a valid offset for a syntactic symbol. See `c-offsets-alist'." (or (eq offset '+) (eq offset '-) diff -r f0a07da7dd45 -r 419c5c316b51 lisp/progmodes/cperl-mode.el --- a/lisp/progmodes/cperl-mode.el Wed Aug 08 07:27:37 2007 +0000 +++ b/lisp/progmodes/cperl-mode.el Wed Aug 08 07:31:11 2007 +0000 @@ -3558,7 +3558,7 @@ (modify-syntax-entry starter (if (eq starter ?\\) "\\" ".") st) (if ender (modify-syntax-entry ender "." st)))) ;; i: have 2 args, after end of the first arg - ;; i2: start of the second arg, if any (before delim iff `ender'). + ;; i2: start of the second arg, if any (before delim if `ender'). ;; ender: the last arg bounded by parens-like chars, the second one of them ;; starter: the starting delimiter of the first arg ;; go-forward: has 2 args, and the second part is empty @@ -8090,7 +8090,7 @@ (defun cperl-beautify-regexp-piece (b e embed level) ;; b is before the starting delimiter, e before the ending ;; e should be a marker, may be changed, but remains "correct". - ;; EMBED is nil iff we process the whole REx. + ;; EMBED is nil if we process the whole REx. ;; The REx is guaranteed to have //x ;; LEVEL shows how many levels deep to go ;; position at enter and at leave is not defined diff -r f0a07da7dd45 -r 419c5c316b51 lisp/progmodes/cpp.el --- a/lisp/progmodes/cpp.el Wed Aug 08 07:27:37 2007 +0000 +++ b/lisp/progmodes/cpp.el Wed Aug 08 07:31:11 2007 +0000 @@ -623,7 +623,8 @@ (defun cpp-edit-toggle-known (arg) "Toggle writable status for known conditionals. -With optional argument ARG, make them writable iff ARG is positive." +With optional argument ARG, make them writable if ARG is positive, +otherwise make them unwritable." (interactive "@P") (if (or (and (null arg) cpp-known-writable) (<= (prefix-numeric-value arg) 0)) @@ -633,7 +634,8 @@ (defun cpp-edit-toggle-unknown (arg) "Toggle writable status for unknown conditionals. -With optional argument ARG, make them writable iff ARG is positive." +With optional argument ARG, make them writable if ARG is positive, +otherwise make them unwritable." (interactive "@P") (if (or (and (null arg) cpp-unknown-writable) (<= (prefix-numeric-value arg) 0)) diff -r f0a07da7dd45 -r 419c5c316b51 lisp/progmodes/etags.el --- a/lisp/progmodes/etags.el Wed Aug 08 07:27:37 2007 +0000 +++ b/lisp/progmodes/etags.el Wed Aug 08 07:31:11 2007 +0000 @@ -256,10 +256,10 @@ (defvar tags-included-tables-function nil "Function to do the work of `tags-included-tables' (which see).") (defvar verify-tags-table-function nil - "Function to return t iff current buffer contains valid tags file.") + "Function to return t if current buffer contains valid tags file.") ;; Initialize the tags table in the current buffer. -;; Returns non-nil iff it is a valid tags table. On +;; Returns non-nil if it is a valid tags table. On ;; non-nil return, the tags table state variable are ;; made buffer-local and initialized to nil. (defun initialize-new-tags-table () @@ -417,7 +417,7 @@ (defun tags-verify-table (file) "Read FILE into a buffer and verify that it is a valid tags table. Sets the current buffer to one visiting FILE (if it exists). -Returns non-nil iff it is a valid table." +Returns non-nil if it is a valid table." (if (get-file-buffer file) ;; The file is already in a buffer. Check for the visited file ;; having changed since we last used it. @@ -1219,8 +1219,8 @@ (verify-tags-table-function . etags-verify-tags-table) )))) -;; Return non-nil iff the current buffer is a valid etags TAGS file. (defun etags-verify-tags-table () + "Return non-nil if the current buffer is a valid etags TAGS file." ;; Use eq instead of = in case char-after returns nil. (eq (char-after (point-min)) ?\f)) diff -r f0a07da7dd45 -r 419c5c316b51 lisp/progmodes/fortran.el --- a/lisp/progmodes/fortran.el Wed Aug 08 07:27:37 2007 +0000 +++ b/lisp/progmodes/fortran.el Wed Aug 08 07:31:11 2007 +0000 @@ -1763,7 +1763,7 @@ ;; From: ralf@up3aud1.gwdg.de (Ralf Fassel) ;; Test if TAB format continuation lines work. (defun fortran-is-in-string-p (where) - "Return non-nil iff WHERE (a buffer position) is inside a Fortran string." + "Return non-nil if WHERE (a buffer position) is inside a Fortran string." (save-excursion (goto-char where) (cond diff -r f0a07da7dd45 -r 419c5c316b51 lisp/progmodes/gdb-ui.el --- a/lisp/progmodes/gdb-ui.el Wed Aug 08 07:27:37 2007 +0000 +++ b/lisp/progmodes/gdb-ui.el Wed Aug 08 07:31:11 2007 +0000 @@ -347,7 +347,8 @@ (defun gdb-many-windows (arg) "Toggle the number of windows in the basic arrangement. -With arg, display additional buffers iff arg is positive." +With prefix argument ARG, display additional buffers if ARG is positive, +otherwise use a single window." (interactive "P") (setq gdb-many-windows (if (null arg) @@ -363,7 +364,8 @@ (defun gdb-use-separate-io-buffer (arg) "Toggle separate IO for debugged program. -With arg, use separate IO iff arg is positive." +With prefix argument ARG, use separate IO if ARG is positive, +otherwise do not." (interactive "P") (setq gdb-use-separate-io-buffer (if (null arg) @@ -664,7 +666,8 @@ (defun gdb-speedbar-auto-raise (arg) "Toggle automatic raising of the speedbar for watch expressions. -With arg, automatically raise speedbar iff arg is positive." +With prefix argument ARG, automatically raise speedbar if ARG is +positive, otherwise don't automatically raise it." (interactive "P") (setq gdb-speedbar-auto-raise (if (null arg) @@ -1381,7 +1384,8 @@ (defun gdb-find-source-frame (arg) "Toggle trying to find a source frame further up stack. -With arg, look for a source frame further up stack iff arg is positive." +With prefix argument ARG, look for a source frame further up +stack if ARG is positive, otherwise don't look further up." (interactive "P") (setq gdb-find-source-frame (if (null arg) diff -r f0a07da7dd45 -r 419c5c316b51 lisp/progmodes/gud.el --- a/lisp/progmodes/gud.el Wed Aug 08 07:27:37 2007 +0000 +++ b/lisp/progmodes/gud.el Wed Aug 08 07:31:11 2007 +0000 @@ -3353,7 +3353,7 @@ (defun gud-tooltip-dereference (&optional arg) "Toggle whether tooltips should show `* expr' or `expr'. -With arg, dereference expr iff arg is positive." +With arg, dereference expr if ARG is positive, otherwise do not derereference." (interactive "P") (setq gud-tooltip-dereference (if (null arg) diff -r f0a07da7dd45 -r 419c5c316b51 lisp/progmodes/hideshow.el --- a/lisp/progmodes/hideshow.el Wed Aug 08 07:27:37 2007 +0000 +++ b/lisp/progmodes/hideshow.el Wed Aug 08 07:31:11 2007 +0000 @@ -262,7 +262,7 @@ t -- open both code and comment blocks nil -- open neither code nor comment blocks -This has effect iff `search-invisible' is set to `open'." +This has effect only if `search-invisible' is set to `open'." :type '(choice (const :tag "open only code blocks" code) (const :tag "open only comment blocks" comment) (const :tag "open both code and comment blocks" t) @@ -515,7 +515,7 @@ (goto-char (if repos-end end beg))) (defun hs-hide-block-at-point (&optional end comment-reg) - "Hide block iff on block beginning. + "Hide block if on block beginning. Optional arg END means reposition at end. Optional arg COMMENT-REG is a list of the form (BEGIN END) and specifies the limits of the comment, or nil if the block is not @@ -679,7 +679,7 @@ (goto-char maxp)) (defmacro hs-life-goes-on (&rest body) - "Evaluate BODY forms iff variable `hs-minor-mode' is non-nil. + "Evaluate BODY forms if variable `hs-minor-mode' is non-nil. In the dynamic context of this macro, `inhibit-point-motion-hooks' and `case-fold-search' are both t." `(when hs-minor-mode diff -r f0a07da7dd45 -r 419c5c316b51 lisp/progmodes/octave-mod.el --- a/lisp/progmodes/octave-mod.el Wed Aug 08 07:27:37 2007 +0000 +++ b/lisp/progmodes/octave-mod.el Wed Aug 08 07:31:11 2007 +0000 @@ -567,24 +567,24 @@ (describe-function major-mode)) (defsubst octave-in-comment-p () - "Returns t if point is inside an Octave comment, nil otherwise." + "Return t if point is inside an Octave comment." (interactive) (save-excursion (nth 4 (parse-partial-sexp (line-beginning-position) (point))))) (defsubst octave-in-string-p () - "Returns t if point is inside an Octave string, nil otherwise." + "Return t if point is inside an Octave string." (interactive) (save-excursion (nth 3 (parse-partial-sexp (line-beginning-position) (point))))) (defsubst octave-not-in-string-or-comment-p () - "Returns t iff point is not inside an Octave string or comment." + "Return t if point is not inside an Octave string or comment." (let ((pps (parse-partial-sexp (line-beginning-position) (point)))) (not (or (nth 3 pps) (nth 4 pps))))) (defun octave-in-block-p () - "Returns t if point is inside an Octave block, nil otherwise. + "Return t if point is inside an Octave block. The block is taken to start at the first letter of the begin keyword and to end after the end keyword." (let ((pos (point))) @@ -599,7 +599,7 @@ (< pos (point))))) (defun octave-in-defun-p () - "Returns t iff point is inside an Octave function declaration. + "Return t if point is inside an Octave function declaration. The function is taken to start at the `f' of `function' and to end after the end keyword." (let ((pos (point))) diff -r f0a07da7dd45 -r 419c5c316b51 lisp/progmodes/python.el --- a/lisp/progmodes/python.el Wed Aug 08 07:27:37 2007 +0000 +++ b/lisp/progmodes/python.el Wed Aug 08 07:31:11 2007 +0000 @@ -348,7 +348,7 @@ (error nil)))))))) (defun python-comment-line-p () - "Return non-nil iff current line has only a comment." + "Return non-nil if current line has only a comment." (save-excursion (end-of-line) (when (eq 'comment (syntax-ppss-context (syntax-ppss))) @@ -356,7 +356,7 @@ (looking-at (rx (or (syntax comment-start) line-end)))))) (defun python-blank-line-p () - "Return non-nil iff current line is blank." + "Return non-nil if current line is blank." (save-excursion (beginning-of-line) (looking-at "\\s-*$"))) @@ -850,7 +850,7 @@ "Skip out of any nested brackets. Skip forward if FORWARD is non-nil, else backward. If SYNTAX is non-nil it is the state returned by `syntax-ppss' at point. -Return non-nil iff skipping was done." +Return non-nil if skipping was done." (let ((depth (syntax-ppss-depth (or syntax (syntax-ppss)))) (forward (if forward -1 1))) (unless (zerop depth) @@ -1191,7 +1191,7 @@ (define-key map "\C-c\C-l" 'python-load-file) (define-key map "\C-c\C-v" 'python-check) ;; Note that we _can_ still use these commands which send to the - ;; Python process even at the prompt iff we have a normal prompt, + ;; Python process even at the prompt provided we have a normal prompt, ;; i.e. '>>> ' and not '... '. See the comment before ;; python-send-region. Fixme: uncomment these if we address that. diff -r f0a07da7dd45 -r 419c5c316b51 lisp/progmodes/which-func.el --- a/lisp/progmodes/which-func.el Wed Aug 08 07:27:37 2007 +0000 +++ b/lisp/progmodes/which-func.el Wed Aug 08 07:31:11 2007 +0000 @@ -232,7 +232,7 @@ When Which Function mode is enabled, the current function name is continuously displayed in the mode line, in certain major modes. -With prefix ARG, turn Which Function mode on iff arg is positive, +With prefix ARG, turn Which Function mode on if arg is positive, and off otherwise." :global t :group 'which-func (if which-function-mode diff -r f0a07da7dd45 -r 419c5c316b51 lisp/progmodes/xscheme.el --- a/lisp/progmodes/xscheme.el Wed Aug 08 07:27:37 2007 +0000 +++ b/lisp/progmodes/xscheme.el Wed Aug 08 07:31:11 2007 +0000 @@ -868,7 +868,7 @@ (sleep-for 1))) (defun xscheme-process-running-p () - "True iff there is a Scheme process whose status is `run'." + "True if there is a Scheme process whose status is `run'." (let ((process (get-process xscheme-process-name))) (and process (eq (process-status process) 'run)))) @@ -882,7 +882,7 @@ (and buffer (get-buffer-window buffer)))) (defun xscheme-process-buffer-current-p () - "True iff the current buffer is the Scheme process buffer." + "True if the current buffer is the Scheme process buffer." (eq (xscheme-process-buffer) (current-buffer))) ;;;; Process Filter Operations