From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Mon, 18 Oct 2021 07:13:51 +0000 (+0200)
Subject: Fix build issue with smerge-mode
X-Git-Tag: emacs-29.0.90~3671^2~515
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a4770152f5f969060edf7a149aa2ee7ff5f5abac;p=emacs.git

Fix build issue with smerge-mode

* lisp/vc/smerge-mode.el (easy-mmode): Require.
---

diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el
index 5a0b90863ae..0be1a03c650 100644
--- a/lisp/vc/smerge-mode.el
+++ b/lisp/vc/smerge-mode.el
@@ -47,6 +47,7 @@
 (require 'diff)				;For diff-check-labels.
 (require 'diff-mode)                    ;For diff-refine.
 (require 'newcomment)
+(require 'easy-mmode)
 
 ;;; The real definition comes later.
 (defvar smerge-mode)