diff options
| author | Lars Ingebrigtsen <larsi@gnus.org> | 2021-10-18 09:13:51 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen <larsi@gnus.org> | 2021-10-18 09:13:51 +0200 |
| commit | a4770152f5f969060edf7a149aa2ee7ff5f5abac (patch) | |
| tree | 11e5f63b0d95ef09da5340c69c7e5cb2e8dc02f0 | |
| parent | dd7cd14d281644d8e2c5b3f16eb7f074f61d18f7 (diff) | |
| download | emacs-a4770152f5f969060edf7a149aa2ee7ff5f5abac.tar.gz | |
Fix build issue with smerge-mode
* lisp/vc/smerge-mode.el (easy-mmode): Require.
| -rw-r--r-- | lisp/vc/smerge-mode.el | 1 |
1 files changed, 1 insertions, 0 deletions
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) |