Doc fixes.

28 files changed, 137 insertions, 137 deletions

diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el
index 4d7a11955b..7646a8c25e 100644
--- a/lisp/calc/calc.el
+++ b/lisp/calc/calc.el
@@ -239,8 +239,8 @@ This can safely be nil as long as the Calc files are on the load-path.")
 ;; Address of the author of Calc, for use by report-calc-bug.
 (defvar calc-bug-address "walters@debian.org")
 
-;; If T, scan keymaps to find all DEL-like keys.
-;; If NIL, only DEL itself is mapped to calc-pop.
+;; If t, scan keymaps to find all DEL-like keys.
+;; if nil, only DEL itself is mapped to calc-pop.
 (defvar calc-scan-for-dels t)
 
 (defvar calc-extensions-loaded nil)
@@ -253,16 +253,16 @@ This can safely be nil as long as the Calc files are on the load-path.")
 ;; This is 1 unless calc-truncate-stack has been used.
 ;;(defvar calc-stack-top 1)
 
-;; If non-NIL, load the calc-ext module automatically when calc is loaded.
+;; If non-nil, load the calc-ext module automatically when calc is loaded.
 ;;(defvar calc-always-load-extensions nil)
 
-;; If non-NIL, display line numbers in Calculator stack.
+;; If non-nil, display line numbers in Calculator stack.
 ;;(defvar calc-line-numbering t)
 
-;; If non-NIL, break long values across multiple lines in Calculator stack.
+;; If non-nil, break long values across multiple lines in Calculator stack.
 ;;(defvar calc-line-breaking t)
 
-;; If NIL, stack display is left-justified.
+;; If nil, stack display is left-justified.
 ;; If 'right, stack display is right-justified.
 ;; If 'center, stack display is centered."
 ;;(defvar calc-display-just nil)
@@ -276,10 +276,10 @@ This can safely be nil as long as the Calc files are on the load-path.")
 ;; Radix for entry and display of numbers in calc-mode, 2-36.
 ;;(defvar calc-number-radix 10)
 
-;; If non-NIL, leading zeros are provided to pad integers to calc-word-size.
+;; If non-nil, leading zeros are provided to pad integers to calc-word-size.
 ;;(defvar calc-leading-zeros nil)
 
-;; If non-NIL, group digits in large displayed integers by inserting spaces.
+;; If non-nil, group digits in large displayed integers by inserting spaces.
 ;; If an integer, group that many digits at a time.
 ;; If 't', use 4 for binary and hex, 3 otherwise.
 ;;(defvar calc-group-digits nil)
@@ -294,7 +294,7 @@ This can safely be nil as long as the Calc files are on the load-path.")
 ;; Format of displayed fractions; a string of one or two of ":" or "/".
 ;;(defvar calc-frac-format '(":" nil))
 
-;; If non-NIL, prefer fractional over floating-point results.
+;; If non-nil, prefer fractional over floating-point results.
 ;;(defvar calc-prefer-frac nil)
 
 ;; Format of displayed hours-minutes-seconds angles, a format string.
@@ -330,32 +330,32 @@ This can safely be nil as long as the Calc files are on the load-path.")
 ;; Preferred form, either 'cplx or 'polar, for complex numbers.
 ;;(defvar calc-complex-mode 'cplx)
 
-;; If NIL, 1 / 0 is left unsimplified.
+;; If nil, 1 / 0 is left unsimplified.
 ;; If 0, 1 / 0 is changed to inf (zeros are considered positive).
 ;; Otherwise, 1 / 0 is changed to uinf (undirected infinity).
 ;;(defvar calc-infinite-mode nil)
 
-;; If non-NIL, display vectors of byte-sized integers as strings.
+;; If non-nil, display vectors of byte-sized integers as strings.
 ;;(defvar calc-display-strings nil)
 
-;; If NIL, vector elements are left-justified.
+;; If nil, vector elements are left-justified.
 ;; If 'right, vector elements are right-justified.
 ;; If 'center, vector elements are centered."
 ;;(defvar calc-matrix-just 'center)
 
-;; If non-NIL, display vectors one element per line.
+;; If non-nil, display vectors one element per line.
 ;;(defvar calc-break-vectors nil)
 
-;; If non-NIL, display long vectors in full.  If NIL, use abbreviated form.
+;; If non-nil, display long vectors in full.  If nil, use abbreviated form.
 ;;(defvar calc-full-vectors t)
 
-;; If non-NIL, display long vectors in full in the trail.
+;; If non-nil, display long vectors in full in the trail.
 ;;(defvar calc-full-trail-vectors t)
 
-;; If non-NIL, separate elements of displayed vectors with this string.
+;; If non-nil, separate elements of displayed vectors with this string.
 ;;(defvar calc-vector-commas ",")
 
-;; If non-NIL, surround displayed vectors with these characters.
+;; If non-nil, surround displayed vectors with these characters.
 ;;(defvar calc-vector-brackets "[]")
 
 ;; A list of code-letter symbols that control "big" matrix display.
@@ -411,79 +411,79 @@ This can safely be nil as long as the Calc files are on the load-path.")
 ;; Type of simplification applied to results.
 ;; If 'none, results are not simplified when pushed on the stack.
 ;; If 'num, functions are simplified only when args are constant.
-;; If NIL, only fast simplifications are applied.
+;; If nil, only fast simplifications are applied.
 ;; If 'binary, math-clip is applied if appropriate.
 ;; If 'alg, math-simplify is applied.
 ;; If 'ext, math-simplify-extended is applied.
 ;; If 'units, math-simplify-units is applied.
 ;;(defvar calc-simplify-mode nil)
 
-;; If non-NIL, recompute evalto's automatically when necessary.
+;; If non-nil, recompute evalto's automatically when necessary.
 ;;(defvar calc-auto-recompute t)
 
-;; If non-NIL, display shows unformatted Lisp exprs.  (For debugging)
+;; If non-nil, display shows unformatted Lisp exprs.  (For debugging)
 ;;(defvar calc-display-raw nil)
 
 ;; Number of digits of internal precision for calc-mode calculations.
 ;;(defvar calc-internal-prec 12)
 
-;; If non-NIL, next operation is Inverse.
+;; If non-nil, next operation is Inverse.
 ;;(defvar calc-inverse-flag nil)
 
-;; If non-NIL, next operation is Hyperbolic.
+;; If non-nil, next operation is Hyperbolic.
 ;;(defvar calc-hyperbolic-flag nil)
 
-;; If non-NIL, next operation should not remove its arguments from stack.
+;; If non-nil, next operation should not remove its arguments from stack.
 ;;(defvar calc-keep-args-flag nil)
 
 ;; If deg, angles are in degrees; if rad, angles are in radians.
 ;; If hms, angles are in degrees-minutes-seconds.
 ;;(defvar calc-angle-mode 'deg)
 
-;; If non-NIL, numeric entry accepts whole algebraic expressions.
-;; If NIL, algebraic expressions must be preceded by "'".
+;; If non-nil, numeric entry accepts whole algebraic expressions.
+;; If nil, algebraic expressions must be preceded by "'".
 ;;(defvar calc-algebraic-mode nil)
 
 ;; Like calc-algebraic-mode except only affects ( and [ keys.
 ;;(defvar calc-incomplete-algebraic-mode nil)
 
-;; If non-NIL, inexact numeric computations like sqrt(2) are postponed.
-;; If NIL, computations on numbers always yield numbers where possible.
+;; If non-nil, inexact numeric computations like sqrt(2) are postponed.
+;; If nil, computations on numbers always yield numbers where possible.
 ;;(defvar calc-symbolic-mode nil)
 
 ;; If 'matrix, variables are assumed to be matrix-valued.
 ;; If a number, variables are assumed to be NxN matrices.
 ;; If 'scalar, variables are assumed to be scalar-valued.
-;; If NIL, symbolic math routines make no assumptions about variables.
+;; If nil, symbolic math routines make no assumptions about variables.
 ;;(defvar calc-matrix-mode nil)
 
-;; If non-NIL, shifted letter keys are prefix keys rather than normal meanings.
+;; If non-nil, shifted letter keys are prefix keys rather than normal meanings.
 ;;(defvar calc-shift-prefix nil)
 
 ;; Initial height of Calculator window.
 ;;(defvar calc-window-height 7)
 
-;; If non-NIL, M-x calc creates a window to display Calculator trail.
+;; If non-nil, M-x calc creates a window to display Calculator trail.
 ;;(defvar calc-display-trail t)
 
-;; If non-NIL, selected sub-formulas are shown by obscuring rest of formula.
-;; If NIL, selected sub-formulas are highlighted by obscuring the sub-formulas.
+;; If non-nil, selected sub-formulas are shown by obscuring rest of formula.
+;; If nil, selected sub-formulas are highlighted by obscuring the sub-formulas.
 ;;(defvar calc-show-selections t)
 
-;; If non-NIL, commands operate only on selected portions of formulas.
-;; If NIL, selections displayed but ignored.
+;; If non-nil, commands operate only on selected portions of formulas.
+;; If nil, selections displayed but ignored.
 ;;(defvar calc-use-selections t)
 
-;; If non-NIL, selection hides deep structure of associative formulas.
+;; If non-nil, selection hides deep structure of associative formulas.
 ;;(defvar calc-assoc-selections t)
 
-;; If non-NIL, display "Working..." for potentially slow Calculator commands.
+;; If non-nil, display "Working..." for potentially slow Calculator commands.
 ;;(defvar calc-display-working-message 'lots)
 
-;; If non-NIL, automatically execute a "why" command to explain odd results.
+;; If non-nil, automatically execute a "why" command to explain odd results.
 ;;(defvar calc-auto-why nil)
 
-;; If non-NIL, display timing information on each slow command.
+;; If non-nil, display timing information on each slow command.
 ;;(defvar calc-timing nil)
 
 ;; Floating-point numbers with this positive exponent or higher above the
@@ -501,7 +501,7 @@ This can safely be nil as long as the Calc files are on the load-path.")
 ;; List of strings for Y prefix help.
 (defvar calc-Y-help-msgs nil)
 
-;; T if calc-settings-file has been loaded yet.
+;; t if calc-settings-file has been loaded yet.
 (defvar calc-loaded-settings-file nil)
 
 
diff --git a/lisp/cmuscheme.el b/lisp/cmuscheme.el
index 5d2e1e25e1..770d5c90c2 100644
--- a/lisp/cmuscheme.el
+++ b/lisp/cmuscheme.el
@@ -352,7 +352,7 @@ next one.")
 (defun scheme-load-file (file-name)
   "Load a Scheme file FILE-NAME into the inferior Scheme process."
   (interactive (comint-get-source "Load Scheme file: " scheme-prev-l/c-dir/file
-				  scheme-source-modes t)) ; T because LOAD
+				  scheme-source-modes t)) ; t because `load'
                                                           ; needs an exact name
   (comint-check-source file-name) ; Check to see if buffer needs saved.
   (setq scheme-prev-l/c-dir/file (cons (file-name-directory    file-name)
@@ -366,7 +366,7 @@ next one.")
   (interactive (comint-get-source "Compile Scheme file: "
 				  scheme-prev-l/c-dir/file
 				  scheme-source-modes
-				  nil)) ; NIL because COMPILE doesn't
+				  nil)) ; nil because COMPILE doesn't
                                         ; need an exact name.
   (comint-check-source file-name) ; Check to see if buffer needs saved.
   (setq scheme-prev-l/c-dir/file (cons (file-name-directory    file-name)
diff --git a/lisp/comint.el b/lisp/comint.el
index af0d303d33..5a2e6f8cbc 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -695,7 +695,7 @@ buffer.  The hook `comint-exec-hook' is run after each exec."
 	     (comint-exec-1 name buffer command switches))))
       (set-process-filter proc 'comint-output-filter)
       (make-local-variable 'comint-ptyp)
-      (setq comint-ptyp process-connection-type) ; T if pty, NIL if pipe.
+      (setq comint-ptyp process-connection-type) ; t if pty, nil if pipe.
       ;; Jump to the end, and set the process mark.
       (goto-char (point-max))
       (set-marker (process-mark proc) (point))
@@ -2272,8 +2272,8 @@ This command is like `M-.' in bash."
 ;;============================================================================
 ;; Many command-interpreters (e.g., Lisp, Scheme, Soar) have
 ;; commands that process files of source text (e.g. loading or compiling
-;; files). So the corresponding process-in-a-buffer modes have commands
-;; for doing this (e.g., lisp-load-file). The functions below are useful
+;; files).  So the corresponding process-in-a-buffer modes have commands
+;; for doing this (e.g., lisp-load-file).  The functions below are useful
 ;; for defining these commands.
 ;;
 ;; Alas, these guys don't do exactly the right thing for Lisp, Scheme
@@ -2281,9 +2281,9 @@ This command is like `M-.' in bash."
 ;; So the compile/load interface gets the wrong default occasionally.
 ;; The load-file/compile-file default mechanism could be smarter -- it
 ;; doesn't know about the relationship between filename extensions and
-;; whether the file is source or executable. If you compile foo.lisp
+;; whether the file is source or executable.  If you compile foo.lisp
 ;; with compile-file, then the next load-file should use foo.bin for
-;; the default, not foo.lisp. This is tricky to do right, particularly
+;; the default, not foo.lisp.  This is tricky to do right, particularly
 ;; because the extension for executable files varies so much (.o, .bin,
 ;; .lbin, .mo, .vo, .ao, ...).
 
@@ -2304,14 +2304,14 @@ This command is like `M-.' in bash."
 ;; commands for tea, soar, cmulisp, and cmuscheme modes.
 ;;
 ;; - PREVIOUS-DIR/FILE is a pair (directory . filename) from the last
-;; source-file processing command. NIL if there hasn't been one yet.
+;; source-file processing command.  nil if there hasn't been one yet.
 ;; - SOURCE-MODES is a list used to determine what buffers contain source
 ;; files: if the major mode of the buffer is in SOURCE-MODES, it's source.
 ;; Typically, (lisp-mode) or (scheme-mode).
 ;;
 ;; If the command is given while the cursor is inside a string, *and*
 ;; the string is an existing filename, *and* the filename is not a directory,
-;; then the string is taken as default. This allows you to just position
+;; then the string is taken as default.  This allows you to just position
 ;; your cursor over a string that's a filename and have it taken as default.
 ;;
 ;; If the command is given in a file buffer whose major mode is in
diff --git a/lisp/completion.el b/lisp/completion.el
index 152f72cab3..85e38549b3 100644
--- a/lisp/completion.el
+++ b/lisp/completion.el
@@ -842,7 +842,7 @@ during the search."
   (reset-cdabbrev-window t))
 
 (defun set-cdabbrev-buffer ()
-  ;; cdabbrev-current-window must not be NIL
+  ;; cdabbrev-current-window must not be nil
   (set-buffer (if (eq cdabbrev-current-window t)
 		  (other-buffer)
 		  (window-buffer cdabbrev-current-window))))
@@ -1001,7 +1001,7 @@ Each symbol is bound to a single completion entry.")
 
 ;; A completion entry is a LIST of string, prefix-symbol num-uses, and
 ;; last-use-time (the time the completion was last used)
-;; last-use-time is T if the string should be kept permanently
+;; last-use-time is t if the string should be kept permanently
 ;; num-uses is incremented every time the completion is used.
 
 ;; We chose lists because (car foo) is faster than (aref foo 0) and the 
@@ -1019,7 +1019,7 @@ Each symbol is bound to a single completion entry.")
 
 (defmacro completion-last-use-time (completion-entry)
   ;;  "The time it was last used.  In hours since origin.  Used to decide
-  ;; whether to save it.  T if one should always save it."
+  ;; whether to save it.  t if one should always save it."
   (list 'nth 2 completion-entry))
 
 (defmacro completion-source (completion-entry)
@@ -1132,7 +1132,7 @@ Each symbol is bound to a single completion entry.")
   ;; "The interned prefix symbol corresponding to cmpl-db-downcase-string."
 (defvar cmpl-db-entry nil)
 (defvar cmpl-db-debug-p nil
-  "Set to T if you want to debug the database.")
+  "Set to t if you want to debug the database.")
 
 ;; READS
 (defun find-exact-completion (string)
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index 5a01ebcc3e..53e1b11cb3 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -939,7 +939,7 @@ a prefix arg lets you edit the `ls' switches used for the new listing."
 
 (defcustom dired-recursive-copies nil
   "*Decide whether recursive copies are allowed.
-Nil means no recursive copies.
+nil means no recursive copies.
 `always' means copy recursively without asking.
 `top' means ask for each directory at top level.
 Anything else means ask for each directory."
@@ -1336,7 +1336,7 @@ Optional arg HOW-TO is used to set the value of the into-dir variable
 ;; symlinks.
 
 (defvar dired-copy-how-to-fn nil
-  "Nil or a function used by `dired-do-copy' to determine target.
+  "nil or a function used by `dired-do-copy' to determine target.
 See HOW-TO argument for `dired-do-create-files'.")
 
 ;;;###autoload
diff --git a/lisp/ediff-init.el b/lisp/ediff-init.el
index b701ae6685..cbc57655ac 100644
--- a/lisp/ediff-init.el
+++ b/lisp/ediff-init.el
@@ -590,7 +590,7 @@ highlighted using ASCII flags."
 Actually, Ediff restores the scope of visibility that existed at startup.")
 
 (defcustom ediff-keep-variants t
-  "*Nil means that non-modified variant buffers should be removed at the end of the session after some interrogation.
+  "*nil means that non-modified variant buffers should be removed at the end of the session after some interrogation.
 Supplying a prefix argument to the quit command `q' temporarily reverses the
 meaning of this variable."
   :type 'boolean
@@ -1241,7 +1241,7 @@ This property can be toggled interactively."
 
 (defcustom ediff-autostore-merges  'group-jobs-only
   "*Save the results of merge jobs automatically.
-Nil means don't save automatically.  t means always save.  Anything but nil or t
+nil means don't save automatically.  t means always save.  Anything but nil or t
 means save automatically only if the merge job is part of a group of jobs, such
 as `ediff-merge-directory' or `ediff-merge-directory-revisions'."
   :type '(choice (const nil) (const t) (const group-jobs-only))
diff --git a/lisp/foldout.el b/lisp/foldout.el
index 94d30467e5..f1905b79a7 100644
--- a/lisp/foldout.el
+++ b/lisp/foldout.el
@@ -216,7 +216,7 @@
 
 (defconst foldout-fold-list nil
   "List of start and end markers for the folds currently entered.
-An end marker of NIL means the fold ends after (point-max).")
+An end marker of nil means the fold ends after (point-max).")
 (make-variable-buffer-local 'foldout-fold-list)
 
 (defconst foldout-modeline-string nil
@@ -269,7 +269,7 @@ optional arg EXPOSURE \(interactively with prefix arg\) changes this:-
 	   ;; I need a marker that will follow the end of the region even when
 	   ;; text is inserted right at the end.  Text gets inserted *after*
 	   ;; markers, so I need it at end+1.  Unfortunately I can't set a
-	   ;; marker at (point-max)+1, so I use NIL to mean the region ends at
+	   ;; marker at (point-max)+1, so I use nil to mean the region ends at
 	   ;; (point-max).
 	   (end-marker (if (eobp) nil (set-marker (make-marker) (1+ end))))
 	   )
@@ -517,7 +517,7 @@ if the event didn't occur on a heading."
 ;;; Keymaps:
 
 (defvar foldout-inhibit-key-bindings nil
-  "Set non-NIL before loading foldout to inhibit key bindings.")
+  "Set non-nil before loading foldout to inhibit key bindings.")
 
 (defvar foldout-mouse-modifiers '(meta control)
   "List of modifier keys to apply to foldout's mouse events.
diff --git a/lisp/gnus/imap.el b/lisp/gnus/imap.el
index ea26733298..d46a92a0b2 100644
--- a/lisp/gnus/imap.el
+++ b/lisp/gnus/imap.el
@@ -1751,21 +1751,21 @@ Return nil if no complete line has arrived."
 ;;
 ;;   addr-adl        = nstring
 ;;                       ; Holds route from [RFC-822] route-addr if
-;;                       ; non-NIL
+;;                       ; non-nil
 ;;
 ;;   addr-host       = nstring
-;;                       ; NIL indicates [RFC-822] group syntax.
+;;                       ; nil indicates [RFC-822] group syntax.
 ;;                       ; Otherwise, holds [RFC-822] domain name
 ;;
 ;;   addr-mailbox    = nstring
-;;                       ; NIL indicates end of [RFC-822] group; if
-;;                       ; non-NIL and addr-host is NIL, holds
+;;                       ; nil indicates end of [RFC-822] group; if
+;;                       ; non-nil and addr-host is nil, holds
 ;;                       ; [RFC-822] group name.
 ;;                       ; Otherwise, holds [RFC-822] local-part
 ;;                       ; after removing [RFC-822] quoting
 ;;
 ;;   addr-name       = nstring
-;;                       ; If non-NIL, holds phrase from [RFC-822]
+;;                       ; If non-nil, holds phrase from [RFC-822]
 ;;                       ; mailbox after removing [RFC-822] quoting
 ;;
 
@@ -2455,7 +2455,7 @@ Return nil if no complete line has arrived."
 	(push (imap-parse-nstring) body);; body-fld-desc
 	(imap-forward)
 	;; next `or' for Sun SIMS bug, it regard body-fld-enc as a
-	;; nstring and return NIL instead of defaulting back to 7BIT
+	;; nstring and return nil instead of defaulting back to 7BIT
 	;; as the standard says.
 	(push (or (imap-parse-nstring) "7BIT") body);; body-fld-enc
 	(imap-forward)
diff --git a/lisp/hippie-exp.el b/lisp/hippie-exp.el
index 11aa65205e..ba53e3a086 100644
--- a/lisp/hippie-exp.el
+++ b/lisp/hippie-exp.el
@@ -263,7 +263,7 @@ Can contain both regexps matching buffer names (as strings) and major modes
 (defcustom hippie-expand-only-buffers ()
   "*A list specifying the only buffers to search (in addition to current).
 Can contain both regexps matching buffer names (as strings) and major modes
-\(as atoms). If non-NIL, this variable overrides the variable
+\(as atoms).  If non-nil, this variable overrides the variable
 `hippie-expand-ignore-buffers'."
   :type '(repeat (choice regexp (symbol :tag "Major Mode")))
   :group 'hippie-expand)
@@ -382,7 +382,7 @@ undoes the expansion."
 
 
 ;; Check if STR is a member of LST.
-;; Transform to the final case if optional TRANS-CASE is non-NIL.
+;; Transform to the final case if optional TRANS-CASE is non-nil.
 (defun he-string-member (str lst &optional trans-case)
   (if str
       (member (if (and trans-case
diff --git a/lisp/mail/footnote.el b/lisp/mail/footnote.el
index a10751b10c..8cf12b8226 100644
--- a/lisp/mail/footnote.el
+++ b/lisp/mail/footnote.el
@@ -513,7 +513,7 @@ styles."
 
 (defun Footnote-text-under-cursor ()
   "Return the number of footnote if in footnote text.
-Nil is returned if the cursor is not positioned over the text of
+Return nil if the cursor is not positioned over the text of
 a footnote."
   (when (and (let ((old-point (point)))
 	       (save-excursion
@@ -536,7 +536,7 @@ a footnote."
 
 (defun Footnote-under-cursor ()
   "Return the number of the footnote underneath the cursor.
-Nil is returned if the cursor is not over a footnote."
+Return nil if the cursor is not over a footnote."
   (or (get-text-property (point) 'footnote-number)
       (Footnote-text-under-cursor)))
 
diff --git a/lisp/mail/mh-comp.el b/lisp/mail/mh-comp.el
index 817cfeb000..bc6556cc31 100644
--- a/lisp/mail/mh-comp.el
+++ b/lisp/mail/mh-comp.el
@@ -1,5 +1,5 @@
 ;;; mh-comp.el --- mh-e functions for composing messages
-;; Time-stamp: <2001-07-15 09:36:30 pavel>
+;; Time-stamp: <2001-12-20 18:55:07 pavel>
 
 ;; Copyright (C) 1993,1995,1997,2000  Free Software Foundation, Inc.
 
@@ -30,7 +30,7 @@
 
 ;;; Change Log:
 
-;; $Id: mh-comp.el,v 1.21 2001/02/08 00:01:35 fx Exp $
+;; $Id: mh-comp.el,v 1.22 2001/07/15 19:53:53 pj Exp $
 
 ;;; Code:
 
@@ -540,7 +540,7 @@ See also documentation for `\\[mh-send]' function."
 (defun mh-read-draft (use initial-contents delete-contents-file)
   ;; Read draft file into a draft buffer and make that buffer the current one.
   ;; USE is a message used for prompting about the intended use of the message.
-  ;; INITIAL-CONTENTS is filename that is read into an empty buffer, or NIL
+  ;; INITIAL-CONTENTS is filename that is read into an empty buffer, or nil
   ;; if buffer should not be modified.  Delete the initial-contents file if
   ;; DELETE-CONTENTS-FILE flag is set.
   ;; Returns the draft folder's name.
@@ -651,7 +651,7 @@ See also documentation for `\\[mh-send]' function."
 (defun mh-goto-header-field (field)
   ;; Move to FIELD in the message header.
   ;; Move to the end of the FIELD name, which should end in a colon.
-  ;; Returns T if found, NIL if not.
+  ;; Returns t if found, nil if not.
   (goto-char (point-min))
   (let ((case-fold-search t)
 	(headers-end (save-excursion
diff --git a/lisp/mail/mh-e.el b/lisp/mail/mh-e.el
index 0925798f48..386a9acf99 100644
--- a/lisp/mail/mh-e.el
+++ b/lisp/mail/mh-e.el
@@ -60,7 +60,7 @@
 ;; Modified by James Larus, BBN, July 1984 and UCB, 1984 & 1985.
 ;; Rewritten for GNU Emacs, James Larus 1985.  larus@ginger.berkeley.edu
 ;; Modified by Stephen Gildea 1988.  gildea@stop.mail-abuse.org
-(defconst mh-e-RCS-id "$Id: mh-e.el,v 1.28 2001/07/15 19:53:53 pj Exp $")
+(defconst mh-e-RCS-id "$Id: mh-e.el,v 1.30 2001/09/23 17:38:22 eliz Exp $")
 
 ;;; Code:
 
@@ -203,7 +203,7 @@ A directory name string, or nil to use current directory."
 
 (defvar mh-partial-folder-mode-line-annotation "select"
   "Annotation when displaying part of a folder.
-The string is displayed after the folder's name.  NIL for no annotation.")
+The string is displayed after the folder's name.  nil for no annotation.")
 
 
 ;;; Internal variables:
@@ -779,8 +779,8 @@ Variables controlling mh-e operation are (defaults in parentheses):
 
  `mhl-formfile' (nil)
     Name of format file to be used by mhl to show messages.
-    A value of T means use the default format file.
-    Nil means don't use mhl to format messages.
+    A value of t means use the default format file.
+    nil means don't use mhl to format messages.
 
  `mh-lpr-command-format' (\"lpr -p -J '%s'\")
     Format for command used to print a message on a system printer.
@@ -1080,7 +1080,7 @@ The value of mh-folder-mode-hook is called when a new folder is set up."
 
 (defun mh-update-unseen ()
   ;; Flush updates to the Unseen sequence out to MH.
-  ;; Return non-NIL iff set the MH folder.
+  ;; Return non-nil iff set the MH folder.
   (if mh-seen-list
       (let* ((unseen-seq (mh-find-seq mh-unseen-seq))
 	     (unseen-msgs (mh-seq-msgs unseen-seq)))
@@ -1211,7 +1211,7 @@ The value of mh-folder-mode-hook is called when a new folder is set up."
 
 
 (defun mh-internal-seq (name)
-  ;; Return non-NIL if NAME is the name of an internal mh-e sequence.
+  ;; Return non-nil if NAME is the name of an internal mh-e sequence.
   (or (memq name '(answered cur deleted forwarded printed))
       (eq name mh-unseen-seq)
       (eq name mh-previous-seq)
diff --git a/lisp/mail/mh-utils.el b/lisp/mail/mh-utils.el
index be0f52ee36..9e079656c4 100644
--- a/lisp/mail/mh-utils.el
+++ b/lisp/mail/mh-utils.el
@@ -116,8 +116,8 @@ The desired message's number will be an argument to format.")
 
 (defcustom mhl-formfile nil
   "*Name of format file to be used by mhl to show and print messages.
-A value of T means use the default format file.
-Nil means don't use mhl to format messages when showing; mhl is still used,
+A value of t means use the default format file.
+nil means don't use mhl to format messages when showing; mhl is still used,
 with the default format file, to format messages when printing them.
 The format used should specify a non-zero value for overflowoffset so
 the message continues to conform to RFC 822 and mh-e can parse the headers."
@@ -133,7 +133,7 @@ prompting the user for a folder.  The function is called from within a
 save-excursion, with point at the start of the message.  It should
 return the folder to offer as the refile or Fcc folder, as a string
 with a leading `+' sign.  It can also return an empty string to use no
-default, or NIL to calculate the default the usual way.
+default, or nil to calculate the default the usual way.
 NOTE: This variable is not an ordinary hook;
 It may not be a list of functions.")
 
@@ -162,7 +162,7 @@ First argument is folder name.  Second is message number.")
 ;; Cached value of the `Path:' component in the user's MH profile.
 (defvar mh-user-path nil)		;User's mail folder directory.
 
-;; An mh-draft-folder of NIL means do not use a draft folder.
+;; An mh-draft-folder of nil means do not use a draft folder.
 ;; Cached value of the `Draft-Folder:' component in the user's MH profile.
 (defvar mh-draft-folder nil)		;Name of folder containing draft messages.
 
@@ -529,7 +529,7 @@ Non-nil third argument means not to show the message."
 
 (defun mh-get-profile-field (field)
   ;; Find and return the value of FIELD in the current buffer.
-  ;; Returns NIL if the field is not in the buffer.
+  ;; Returns nil if the field is not in the buffer.
   (let ((case-fold-search t))
     (goto-char (point-min))
     (cond ((not (re-search-forward (format "^%s" field) nil t)) nil)
@@ -848,7 +848,7 @@ directory names."
 
 
 (defun mh-folder-name-p (name)
-  ;; Return non-NIL if NAME is possibly the name of a folder.
+  ;; Return non-nil if NAME is possibly the name of a folder.
   ;; A name (a string or symbol) can be a folder name if it begins with "+".
   (if (symbolp name)
       (eq (aref (symbol-name name) 0) ?+)
diff --git a/lisp/obsolete/cplus-md.el b/lisp/obsolete/cplus-md.el
index 5eb219da6b..2eb47fd926 100644
--- a/lisp/obsolete/cplus-md.el
+++ b/lisp/obsolete/cplus-md.el
@@ -169,7 +169,7 @@ with the colon on the first line."
   :group 'old-c++)
 (defcustom c++-empty-arglist-indent nil
   "*Indicates how far to indent an line following an empty argument
-list.  Nil indicates to just after the paren."
+list.  nil indicates to just after the paren."
   :type '(choice (const nil) integer)
   :group 'old-c++)
 
@@ -316,7 +316,7 @@ Variables controlling indentation style:
     Indentation level of member initializations in function declarations,
     if they are on a separate line beginning with a colon.
  c++-continued-member-init-offset
-    Extra indentation for continuation lines of member initializations; NIL
+    Extra indentation for continuation lines of member initializations; nil
     means to align with previous initializations rather than with the colon.
 
 Settings for K&R, BSD, and Stroustrup indentation styles are
diff --git a/lisp/obsolete/hilit19.el b/lisp/obsolete/hilit19.el
index e70045e641..305838eea2 100644
--- a/lisp/obsolete/hilit19.el
+++ b/lisp/obsolete/hilit19.el
@@ -325,7 +325,7 @@
   "* If non-nil, this inhibits progress indicators during highlighting")
 
 (defvar hilit-auto-highlight t
-  "* T if we should highlight all buffers as we find 'em, nil to disable
+  "* t if we should highlight all buffers as we find 'em, nil to disable
   automatic highlighting by the find-file hook.")
 
 (defvar hilit-auto-highlight-maxout 60000 ; hilit19 keeps getting bigger...
@@ -333,7 +333,7 @@
 
 (defvar hilit-auto-rehighlight t
   "* If this is non-nil, then hilit-redraw and hilit-recenter will also
-  rehighlight part or all of the current buffer.  T will rehighlight the
+  rehighlight part or all of the current buffer.  t will rehighlight the
   whole buffer, a NUMBER will rehighlight that many lines before and after
   the cursor, and the symbol 'visible' will rehighlight only the visible
   portion of the current buffer.  This variable is buffer-local.")
@@ -346,10 +346,10 @@
   THRESHOLD.")
 
 (defvar hilit-face-check t
-  "* T slows down highlighting but permits the user to change fonts without
-  losing bold and italic faces...  T causes hilit-lookup-face-create to dig
+  "* t slows down highlighting but permits the user to change fonts without
+  losing bold and italic faces...  t causes hilit-lookup-face-create to dig
   through the frame parameters for the current window every time it's called.
-  If you never change fonts in emacs, set this to NIL.")
+  If you never change fonts in emacs, set this to nil.")
 
 ;; Variables which must be set before loading hilit19.
 
@@ -1051,7 +1051,7 @@ Optionally, place the new pattern first in the pattern list"
   (and (interactive-p) (hilit-rehighlight-buffer)))
 
 (defun hilit-string-find (qchar)
-  "looks for a string and returns (start . end) or NIL.  The argument QCHAR
+  "Looks for a string and returns (start . end) or nil.  The argument QCHAR
 is the character that would precede a character constant double quote.
 Finds strings delimited by double quotes.  The first double quote may not be
 preceded by QCHAR and the closing double quote may not be preceded by an odd
diff --git a/lisp/pcvs-defs.el b/lisp/pcvs-defs.el
index 783e39004f..eaf8d5f78a 100644
--- a/lisp/pcvs-defs.el
+++ b/lisp/pcvs-defs.el
@@ -4,7 +4,7 @@
 
 ;; Author: Stefan Monnier <monnier@cs.yale.edu>
 ;; Keywords: pcl-cvs
-;; Revision: $Id: pcvs-defs.el,v 1.15 2001/07/16 07:46:48 pj Exp $
+;; Revision: $Id: pcvs-defs.el,v 1.16 2001/10/31 17:39:07 sds Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -168,7 +168,7 @@ displayed when asking for confirmation."
 
 (defcustom cvs-add-default-message nil
   "*Default message to use when adding files.
-If set to NIL, `cvs-mode-add' will always prompt for a message."
+If set to nil, `cvs-mode-add' will always prompt for a message."
   :group 'pcl-cvs
   :type '(choice (const :tag "Prompt" nil)
 		 (string)))
@@ -495,7 +495,7 @@ whether to use the new feature or not.
 Sadly, even with a new cvs executable, if you connect to an older cvs server
 \(typically a cvs-1.9 on the server), the old restriction applies.  In such
 a case the sanity check made by pcl-cvs fails and you will have to manually
-set this variable to T (until the cvs server is upgraded).
+set this variable to t (until the cvs server is upgraded).
 When the above problem occurs, pcl-cvs should (hopefully) catch cvs' error
 message and replace it with a message tell you to change this variable.")
 
diff --git a/lisp/pcvs-util.el b/lisp/pcvs-util.el
index 4a6a3979f7..849bbd69f4 100644
--- a/lisp/pcvs-util.el
+++ b/lisp/pcvs-util.el
@@ -5,7 +5,7 @@
 
 ;; Author: Stefan Monnier <monnier@cs.yale.edu>
 ;; Keywords: pcl-cvs
-;; Revision: $Id: pcvs-util.el,v 1.15 2001/11/17 00:48:14 monnier Exp $
+;; Revision: $Id: pcvs-util.el,v 1.16 2001/12/02 07:41:47 monnier Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -372,7 +372,7 @@ If ARG is negative (or \\[universal-argument] which corresponds to negative 0),
   it queries the user and sets the -ARG'th default.
 If ARG is greater than 9 (or \\[universal-argument] \\[universal-argument]),
   the (ARG mod 10)'th prefix is made persistent.
-If ARG is NIL toggle the PREFIX's value between its 0th default and NIL
+If ARG is nil toggle the PREFIX's value between its 0th default and nil
   and reset the persistence."
   (let* ((prefix (symbol-value (cvs-prefix-sym sym)))
 	 (numarg (if (integerp arg) arg 0))
diff --git a/lisp/play/gomoku.el b/lisp/play/gomoku.el
index 28c829d2ac..9096d4be79 100644
--- a/lisp/play/gomoku.el
+++ b/lisp/play/gomoku.el
@@ -947,7 +947,7 @@ If the game is finished, this command requests for another game."
     (message "Chicken !")))
 
 (defun gomoku-offer-a-draw ()
-  "Offer a draw and return T if Human accepted it."
+  "Offer a draw and return t if Human accepted it."
   (or (y-or-n-p "I offer you a draw. Do you accept it ")
       (not (setq gomoku-human-refused-draw t))))
 
@@ -1095,14 +1095,14 @@ If the game is finished, this command requests for another game."
 ;; who won. The solution is to scan the board along all four directions.
 
 (defun gomoku-find-filled-qtuple (square value)
-  "Return T if SQUARE belongs to a qtuple filled with VALUEs."
+  "Return t if SQUARE belongs to a qtuple filled with VALUEs."
   (or (gomoku-check-filled-qtuple square value 1 0)
       (gomoku-check-filled-qtuple square value 0 1)
       (gomoku-check-filled-qtuple square value 1 1)
       (gomoku-check-filled-qtuple square value -1 1)))
 
 (defun gomoku-check-filled-qtuple (square value dx dy)
-  "Return T if SQUARE belongs to a qtuple filled  with VALUEs along DX, DY."
+  "Return t if SQUARE belongs to a qtuple filled  with VALUEs along DX, DY."
   (let ((a 0) (b 0)
 	(left square) (right square)
 	(depl (gomoku-xy-to-index dx dy)))
diff --git a/lisp/progmodes/ebrowse.el b/lisp/progmodes/ebrowse.el
index 77782ccf85..0e1b862e27 100644
--- a/lisp/progmodes/ebrowse.el
+++ b/lisp/progmodes/ebrowse.el
@@ -3322,8 +3322,8 @@ from point as default.  Value is a list (CLASS-NAME MEMBER-NAME)."
 		   (name (ebrowse-ignoring-completion-case
 			   (completing-read prompt alist nil nil member-name)))
 		   (completion-result (try-completion name alist)))
-	      ;; Cannot rely on `try-completion' returning T for exact
-	      ;; matches!  it returns the the name as a string.
+	      ;; Cannot rely on `try-completion' returning t for exact
+	      ;; matches!  It returns the the name as a string.
 	      (unless (setq member-info (gethash name members))
 		(if (y-or-n-p "No exact match found.  Try substrings? ")
 		    (setq name 
diff --git a/lisp/progmodes/idlwave.el b/lisp/progmodes/idlwave.el
index 0d7f5399af..f3a66c538a 100644
--- a/lisp/progmodes/idlwave.el
+++ b/lisp/progmodes/idlwave.el
@@ -4,7 +4,7 @@
 ;; Author: Chris Chase <chase@att.com>
 ;; Maintainer: John-David Smith <jdsmith@astro.cornell.edu>
 ;; Version: 4.7
-;; Date: $Date: 2001/11/27 15:52:51 $
+;; Date: $Date: 2001/12/01 12:54:29 $
 ;; Keywords: languages
 
 ;; This file is part of GNU Emacs.
@@ -680,7 +680,7 @@ with this font in order to remind the user that this arrow is special."
 
 (defcustom idlwave-function-completion-adds-paren t
   "*Non-nil means, completion automatically adds `(' after completed function.
-Nil means, don't add anything.
+nil means, don't add anything.
 A value of `2' means, also add the closing parenthesis and position cursor
 between the two."
   :group 'idlwave-completion
@@ -913,7 +913,7 @@ See help on `idlwave-action-and-binding' for examples.")
 ")
   "*A list (PATHNAME STRING) specifying the doc-header template to use for
 summarizing a file. If PATHNAME is non-nil then this file will be included.
-Otherwise STRING is used. If NIL, the file summary will be omitted.
+Otherwise STRING is used. If nil, the file summary will be omitted.
 For example you might set PATHNAME to the path for the
 lib_template.pro file included in the IDL distribution.")
 
diff --git a/lisp/progmodes/inf-lisp.el b/lisp/progmodes/inf-lisp.el
index c1b3a5e58b..9e2aa052cf 100644
--- a/lisp/progmodes/inf-lisp.el
+++ b/lisp/progmodes/inf-lisp.el
@@ -436,7 +436,7 @@ Used by these commands to determine defaults.")
 (defun lisp-load-file (file-name)
   "Load a Lisp file into the inferior Lisp process."
   (interactive (comint-get-source "Load Lisp file: " lisp-prev-l/c-dir/file
-				  lisp-source-modes nil)) ; NIL because LOAD
+				  lisp-source-modes nil)) ; nil because LOAD
 					; doesn't need an exact name
   (comint-check-source file-name) ; Check to see if buffer needs saved.
   (setq lisp-prev-l/c-dir/file (cons (file-name-directory    file-name)
@@ -449,7 +449,7 @@ Used by these commands to determine defaults.")
 (defun lisp-compile-file (file-name)
   "Compile a Lisp file in the inferior Lisp process."
   (interactive (comint-get-source "Compile Lisp file: " lisp-prev-l/c-dir/file
-				  lisp-source-modes nil)) ; NIL = don't need
+				  lisp-source-modes nil)) ; nil = don't need
 					; suffix .lisp
   (comint-check-source file-name) ; Check to see if buffer needs saved.
   (setq lisp-prev-l/c-dir/file (cons (file-name-directory    file-name)
diff --git a/lisp/progmodes/octave-mod.el b/lisp/progmodes/octave-mod.el
index b87e2ee5bf..c635d8c9d1 100644
--- a/lisp/progmodes/octave-mod.el
+++ b/lisp/progmodes/octave-mod.el
@@ -386,7 +386,7 @@ Currently, only builtin variables can be completed.")
   "Imenu expression for Octave mode.  See `imenu-generic-expression'.")
 
 (defcustom octave-mode-startup-message t
-  "*Nil means do not display the Octave mode startup message."
+  "*nil means do not display the Octave mode startup message."
   :type 'boolean
   :group 'octave)
 
@@ -464,7 +464,7 @@ octave-continuation-string
   Default is a backslash.
 
 octave-mode-startup-message
-  Nil means do not display the Octave mode startup message.
+  nil means do not display the Octave mode startup message.
   Default is t.
 
 octave-send-echo-input
diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el
index 9b61e23e9d..1946ba404e 100644
--- a/lisp/progmodes/vhdl-mode.el
+++ b/lisp/progmodes/vhdl-mode.el
@@ -564,13 +564,13 @@ NOTE: Activate the new setting in a VHDL buffer using the menu entry
 
 (defcustom vhdl-reset-active-high nil
   "*Non-nil means reset in sequential processes is active high.
-Nil means active low."
+nil means active low."
   :type 'boolean
   :group 'vhdl-sequential-process)
 
 (defcustom vhdl-clock-rising-edge t
   "*Non-nil means rising edge of clock triggers sequential processes.
-Nil means falling edge."
+nil means falling edge."
   :type 'boolean
   :group 'vhdl-sequential-process)
 
diff --git a/lisp/recentf.el b/lisp/recentf.el
index dc79e6c0bc..44e4145474 100644
--- a/lisp/recentf.el
+++ b/lisp/recentf.el
@@ -135,7 +135,7 @@ list of recently opened files."
 
 (defcustom recentf-menu-filter nil
   "*Function used to filter files displayed in the recentf menu.
-Nil means no filter.  The following functions are predefined:
+nil means no filter.  The following functions are predefined:
 
 - `recentf-sort-ascending' to sort menu items in ascending order.
 - `recentf-sort-descending' to sort menu items in descending order.
@@ -562,7 +562,7 @@ defined."
 
 (defcustom recentf-arrange-by-rule-subfilter nil
   "*Function used by `recentf-arrange-by-rule' to filter sub-menu elements.
-Nil means no filter.  See also `recentf-menu-filter'.  You can't use
+nil means no filter.  See also `recentf-menu-filter'.  You can't use
 `recentf-arrange-by-rule' itself here!"
   :group 'recentf-filters
   :type '(choice (const nil) function)
diff --git a/lisp/tempo.el b/lisp/tempo.el
index ae9c7731b4..1e72fd76e8 100644
--- a/lisp/tempo.el
+++ b/lisp/tempo.el
@@ -125,22 +125,22 @@ user for text to insert in the templates"
 
 (defcustom tempo-insert-region nil
   "*Automatically insert current region when there is a `r' in the template
-If this variable is NIL, `r' elements will be treated just like `p'
+If this variable is nil, `r' elements will be treated just like `p'
 elements, unless the template function is given a prefix (or a non-nil
-argument). If this variable is non-NIL, the behaviour is reversed.
+argument).  If this variable is non-nil, the behaviour is reversed.
 
 In Transient Mark mode, this option is unused."
   :type 'boolean
   :group 'tempo)
 
 (defcustom tempo-show-completion-buffer t
-  "*If non-NIL, show a buffer with possible completions, when only
+  "*If non-nil, show a buffer with possible completions, when only
 a partial completion can be found"
   :type 'boolean
   :group 'tempo)
 
 (defcustom tempo-leave-completion-buffer nil
-  "*If NIL, a completion buffer generated by \\[tempo-complete-tag]
+  "*If nil, a completion buffer generated by \\[tempo-complete-tag]
 disappears at the next keypress; otherwise, it remains forever."
   :type 'boolean
   :group 'tempo)
@@ -197,16 +197,16 @@ should be replaced with a template.")
   "Element handlers for user-defined elements.
 A list of symbols which are bound to functions that take one argument.
 This function should return something to be sent to `tempo-insert' if
-it recognizes the argument, and NIL otherwise")
+it recognizes the argument, and nil otherwise.")
 
 (defvar tempo-named-insertions nil
-  "Temporary storage for named insertions")
+  "Temporary storage for named insertions.")
 
 (defvar tempo-region-start (make-marker)
-  "Region start when inserting around the region")
+  "Region start when inserting around the region.")
 
 (defvar tempo-region-stop (make-marker)
-  "Region stop when inserting around the region")
+  "Region stop when inserting around the region.")
 
 ;; Make some variables local to every buffer
 
@@ -404,7 +404,7 @@ possible."
   "Compatibility hack for tempo-insert-prompt.
 PROMPT can be either a prompt string, or a list of arguments to
 tempo-insert-prompt, or nil."
-  (if (consp prompt)			; not NIL either
+  (if (consp prompt)			; not nil either
       (apply 'tempo-insert-prompt prompt)
     (tempo-insert-prompt prompt)))
 
@@ -630,7 +630,7 @@ Whenever it is needed again it will be rebuilt."
 
 (defun tempo-build-collection ()
   "Build a collection of all the tags and return it.
-If `tempo-dirty-collection' is NIL, the old collection is reused."
+If `tempo-dirty-collection' is nil, the old collection is reused."
   (prog1
       (or (and (not tempo-dirty-collection)
 	       tempo-collection)
@@ -681,10 +681,10 @@ If a single match is found, the corresponding template is expanded in
 place of the matching string.
 
 If a partial completion or no match at all is found, and SILENT is
-non-NIL, the function will give a signal.
+non-nil, the function will give a signal.
 
 If a partial completion is found and `tempo-show-completion-buffer' is
-non-NIL, a buffer containing possible completions is displayed."
+non-nil, a buffer containing possible completions is displayed."
 
   ;; This function may look like a hack, but this is how I want it to
   ;; work.
diff --git a/lisp/term.el b/lisp/term.el
index 76b0a09a70..51faa6ff9a 100644
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -1376,7 +1376,7 @@ buffer.  The hook term-exec-hook is run after each exec."
     ;; Crank up a new process
     (let ((proc (term-exec-1 name buffer command switches)))
       (make-local-variable 'term-ptyp)
-      (setq term-ptyp process-connection-type) ; T if pty, NIL if pipe.
+      (setq term-ptyp process-connection-type) ; t if pty, nil if pipe.
       ;; Jump to the end, and set the process mark.
       (goto-char (point-max))
       (set-marker (process-mark proc) (point))
@@ -1991,13 +1991,13 @@ If the interpreter is the csh,
         initial string matching regexp term-prompt-regexp.
     term-input-filter-functions monitors input for \"cd\", \"pushd\", and
 	\"popd\" commands.  When it sees one, it cd's the buffer.
-    term-input-filter is the default: returns T if the input isn't all white
+    term-input-filter is the default: returns t if the input isn't all white
 	space.
 
 If the term is Lucid Common Lisp,
     term-get-old-input snarfs the sexp ending at point.
     term-input-filter-functions does nothing.
-    term-input-filter returns NIL if the input matches input-filter-regexp,
+    term-input-filter returns nil if the input matches input-filter-regexp,
         which matches (1) all whitespace (2) :a, :c, etc.
 
 Similarly for Soar, Scheme, etc."
diff --git a/lisp/textmodes/scribe.el b/lisp/textmodes/scribe.el
index f40c1dfc0b..16067d1963 100644
--- a/lisp/textmodes/scribe.el
+++ b/lisp/textmodes/scribe.el
@@ -42,17 +42,17 @@
   "Abbrev table used while in scribe mode.")
 
 (defcustom scribe-fancy-paragraphs nil
-  "*Non-NIL makes Scribe mode use a different style of paragraph separation."
+  "*Non-nil makes Scribe mode use a different style of paragraph separation."
   :type 'boolean
   :group 'scribe)
 
 (defcustom scribe-electric-quote nil
-  "*Non-NIL makes insert of double quote use `` or '' depending on context."
+  "*Non-nil makes insert of double quote use `` or '' depending on context."
   :type 'boolean
   :group 'scribe)
 
 (defcustom scribe-electric-parenthesis nil
-  "*Non-NIL makes parenthesis char ( (]}> ) automatically insert its close
+  "*Non-nil makes parenthesis char ( (]}> ) automatically insert its close
 if typed after an @Command form."
   :type 'boolean
   :group 'scribe)
@@ -261,7 +261,7 @@ to skip backward."
 
 (defun scribe-insert-quote (count)
   "Insert ``, '' or \" according to preceding character.
-If `scribe-electric-quote' is non-NIL, insert ``, '' or \" according
+If `scribe-electric-quote' is non-nil, insert ``, '' or \" according
 to preceding character.  With numeric arg N, always insert N \" characters.
 Else just insert \"."
   (interactive "P")
@@ -297,7 +297,7 @@ Else just insert \"."
 		 (t "``")))))))))
 
 (defun scribe-parenthesis (count)
-  "If scribe-electric-parenthesis is non-NIL, insertion of an open-parenthesis
+  "If scribe-electric-parenthesis is non-nil, insertion of an open-parenthesis
 character inserts the following close parenthesis character if the
 preceding text is of the form @Command."
   (interactive "P")
diff --git a/lisp/vc.el b/lisp/vc.el
index 7288b93935..6c2b5d954a 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Andre Spiegel <spiegel@gnu.org>
 ;; Keywords: tools
 
-;; $Id: vc.el,v 1.322 2001/11/26 16:07:50 spiegel Exp $
+;; $Id: vc.el,v 1.323 2001/11/26 16:17:17 pj Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -316,7 +316,7 @@
 ;;   as a floating point fractional number of days.  The helper
 ;;   function `vc-annotate-convert-time' may be useful for converting
 ;;   multi-part times as returned by `current-time' and `encode-time'
-;;   to this format.  Return NIL if no more lines of annotation appear
+;;   to this format.  Return nil if no more lines of annotation appear
 ;;   in the buffer.  You can safely assume that point is placed at the
 ;;   beginning of each line, starting at `point-min'.  The buffer that
 ;;   point is placed in is the Annotate output, as defined by the
@@ -2893,7 +2893,7 @@ Uses `rcs2log' which only works for RCS and CVS."
 
 (defun vc-annotate-get-backend (buffer)
   "Return the backend matching \"Annotate\" buffer BUFFER.
-Return NIL if no match made.  Associations are made based on
+Return nil if no match made.  Associations are made based on
 `vc-annotate-buffers'."
   (cdr (assoc buffer vc-annotate-buffers)))