--- lisp/term.el
+++ lisp/term.el	Wed Jul 23 17:53:03 2003
@@ -658,10 +658,6 @@
 (put 'term-scroll-show-maximum-output 'permanent-local t)
 (put 'term-ptyp 'permanent-local t)
 
-;; Do FORMS if running under Emacs 19 or later.
-(defmacro term-if-emacs19 (&rest forms)
-  (if (string-match "^\\(19\\|[2-9][0-9]\\)" emacs-version)
-      (cons 'progn forms)))
 ;; True if running under XEmacs (previously Lucid Emacs).
 (defmacro term-is-xemacs ()  '(string-match "Lucid" emacs-version))
 ;; Do FORM if running under XEmacs (previously Lucid Emacs).
@@ -1039,7 +1035,7 @@
 
 ;; Menu bars:
 (term-ifnot-xemacs
- (term-if-emacs19
+ (progn
 
   ;; terminal:
   (let (newmap)
@@ -1275,7 +1271,7 @@
 
 ;;; Added nearly all the 'grey keys' -mm
 
-	(term-if-emacs19
+	(progn
 	 (term-if-xemacs
 	  (define-key term-raw-map [button2] 'term-mouse-paste))
 	 (term-ifnot-xemacs
@@ -1380,7 +1376,7 @@
     ;; 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))
@@ -1434,6 +1430,7 @@
 	       (format "TERMINFO=%s" data-directory)
 	    (format term-termcap-format "TERMCAP="
 		    term-term-name term-height term-width))
+	   ;; Breaks `./configure' of w3 and url which try to run $EMACS.
 	   (format "EMACS=%s (term:%s)" emacs-version term-protocol-version)
 	   (format "LINES=%d" term-height)
 	   (format "COLUMNS=%d" term-width))
@@ -1994,13 +1991,13 @@
         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."
@@ -3343,7 +3340,7 @@
 	(define-key map ">" 'term-pager-eob)
 
 	;; Add menu bar.
-	(term-if-emacs19
+	(progn
 	 (term-ifnot-xemacs
 	  (define-key map [menu-bar terminal] term-terminal-menu)
 	  (define-key map [menu-bar signals] term-signals-menu)