; Unconditionally require built-in libraries

6 files changed, 11 insertions, 14 deletions

diff --git a/lisp/cedet/semantic/wisent/python.el b/lisp/cedet/semantic/wisent/python.el
index 941efbbbef3..6b2833ef448 100644
--- a/lisp/cedet/semantic/wisent/python.el
+++ b/lisp/cedet/semantic/wisent/python.el
@@ -1,6 +1,6 @@
 ;;; wisent-python.el --- Semantic support for Python  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2002, 2004, 2006-2022 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2022 Free Software Foundation, Inc.
 
 ;; Author: Richard Kim <emacs18@gmail.com>
 ;; Created: June 2002
@@ -27,9 +27,7 @@
 
 ;;; Code:
 
-;; Try to load python support, but fail silently since it is only used
-;; for optional functionality
-(require 'python nil t)
+(require 'python)
 
 (require 'semantic/wisent)
 (require 'semantic/wisent/python-wy)
diff --git a/lisp/eshell/esh-util.el b/lisp/eshell/esh-util.el
index 5144e305121..9258ca5e40e 100644
--- a/lisp/eshell/esh-util.el
+++ b/lisp/eshell/esh-util.el
@@ -539,7 +539,7 @@ list."
 (autoload 'parse-time-string "parse-time")
 
 (eval-when-compile
-  (require 'ange-ftp nil t))		; ange-ftp-parse-filename
+  (require 'ange-ftp))		; ange-ftp-parse-filename
 
 (defvar tramp-file-name-structure)
 (declare-function ange-ftp-ls "ange-ftp"
diff --git a/lisp/mh-e/mh-folder.el b/lisp/mh-e/mh-folder.el
index 7f200534ef9..5b902902378 100644
--- a/lisp/mh-e/mh-folder.el
+++ b/lisp/mh-e/mh-folder.el
@@ -510,7 +510,7 @@ font-lock is done highlighting.")
   nil)
 
 ;; Register mh-folder-mode as supporting which-function-mode...
-(eval-and-compile (require 'which-func nil t))
+(require 'which-func)
 (when (and (boundp 'which-func-modes) (listp which-func-modes))
   (add-to-list 'which-func-modes 'mh-folder-mode))
 
diff --git a/lisp/mh-e/mh-gnus.el b/lisp/mh-e/mh-gnus.el
index 685553164cf..b797000566e 100644
--- a/lisp/mh-e/mh-gnus.el
+++ b/lisp/mh-e/mh-gnus.el
@@ -28,12 +28,11 @@
 
 (require 'mh-e)
 
-(eval-and-compile
-  (require 'gnus-util nil t)
-  (require 'mm-bodies nil t)
-  (require 'mm-decode nil t)
-  (require 'mm-view nil t)
-  (require 'mml nil t))
+(require 'gnus-util)
+(require 'mm-bodies)
+(require 'mm-decode)
+(require 'mm-view)
+(require 'mml)
 
 (defun mh-gnus-local-map-property (map)
   "Return a list suitable for a text property list specifying keymap MAP."
diff --git a/lisp/mh-e/mh-search.el b/lisp/mh-e/mh-search.el
index 8a8a8c33581..058ea4499fd 100644
--- a/lisp/mh-e/mh-search.el
+++ b/lisp/mh-e/mh-search.el
@@ -1411,7 +1411,7 @@ being the list of messages originally from that folder."
     (when cur-msg (mh-goto-msg cur-msg t t))
     (set-buffer-modified-p old-buffer-modified-flag)))
 
-(eval-and-compile (require 'which-func nil t))
+(require 'which-func)
 
 ;;;###mh-autoload
 (defun mh-index-create-imenu-index ()
diff --git a/lisp/obsolete/mh-compat.el b/lisp/obsolete/mh-compat.el
index 2c9d1b73e28..a5be3bd7426 100644
--- a/lisp/obsolete/mh-compat.el
+++ b/lisp/obsolete/mh-compat.el
@@ -84,7 +84,7 @@ the completions."
 (define-obsolete-function-alias 'mh-line-end-position
   #'line-end-position "29.1")
 
-(require 'mailabbrev nil t)
+(require 'mailabbrev)
 (define-obsolete-function-alias 'mh-mail-abbrev-make-syntax-table
   #'mail-abbrev-make-syntax-table "29.1")