diff options
| author | Po Lu | 2023-05-12 10:43:52 +0800 |
|---|---|---|
| committer | Po Lu | 2023-05-12 10:43:52 +0800 |
| commit | 7ac8bcaacc1f3dbbda3febe09dde6d18a2d69729 (patch) | |
| tree | 0f793adca34d302415ccb31b945b6c1084425724 /lisp/term | |
| parent | 140c5bffc6441e6cee9ba60af114392729239abe (diff) | |
| parent | 30501083f2ff24ee1291a68e83c65b89c644f44b (diff) | |
| download | emacs-7ac8bcaacc1f3dbbda3febe09dde6d18a2d69729.tar.gz emacs-7ac8bcaacc1f3dbbda3febe09dde6d18a2d69729.zip | |
Merge remote-tracking branch 'origin/master' into feature/android
Diffstat (limited to 'lisp/term')
| -rw-r--r-- | lisp/term/haiku-win.el | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lisp/term/haiku-win.el b/lisp/term/haiku-win.el index ae5a2f2fc6b..50c9cb5b9d4 100644 --- a/lisp/term/haiku-win.el +++ b/lisp/term/haiku-win.el | |||
| @@ -36,6 +36,9 @@ | |||
| 36 | (require 'menu-bar) | 36 | (require 'menu-bar) |
| 37 | (require 'fontset) | 37 | (require 'fontset) |
| 38 | (require 'dnd) | 38 | (require 'dnd) |
| 39 | ;; For when building a --without-x configuration, where this is not | ||
| 40 | ;; preloaded. | ||
| 41 | (eval-when-compile (require 'mwheel)) | ||
| 39 | 42 | ||
| 40 | (add-to-list 'display-format-alist '(".*" . haiku)) | 43 | (add-to-list 'display-format-alist '(".*" . haiku)) |
| 41 | 44 | ||