From 2f0c56f705c23a5f707847a28e105209b8493e6c Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Mon, 13 May 2019 14:37:37 -0400 Subject: [PATCH] input/chinese: remove chinese-wbim See https://github.com/hlissner/doom-emacs/commit/fadbfb321f469c21fbc465be023e0b4cf55d9fd7#commitcomment-33512172 --- modules/input/chinese/README.org | 2 +- modules/input/chinese/config.el | 17 ----------------- modules/input/chinese/packages.el | 4 +--- 3 files changed, 2 insertions(+), 21 deletions(-) diff --git a/modules/input/chinese/README.org b/modules/input/chinese/README.org index e63140473..3c8207d23 100644 --- a/modules/input/chinese/README.org +++ b/modules/input/chinese/README.org @@ -23,7 +23,7 @@ would be greatly appreciated! Especially where performance is concerned. #+end_quote ** Module Flags -+ =+wubi= +This module provides no flags. ** Plugins + [[https://github.com/tumashu/pyim][pyim]] (unless =+wubi=) diff --git a/modules/input/chinese/config.el b/modules/input/chinese/config.el index 0d44c2561..b0d390d45 100644 --- a/modules/input/chinese/config.el +++ b/modules/input/chinese/config.el @@ -1,29 +1,12 @@ ;;; input/chinese/config.el -*- lexical-binding: t; -*- (def-package! pyim - :unless (featurep! +wubi) :config (setq pyim-dcache-directory (concat doom-cache-dir "pyim/") pyim-page-tooltip t default-input-method "pyim")) -(def-package! chinese-wbim - :when (featurep! +wubi) - :init - (setq chinese-wbim-use-tooltip nil) ; tooptip isn't good enough - :config - (setq default-input-method 'chinese-wubi) - - (autoload 'chinese-wbim-use-package "chinese-wubi" - "Another emacs input method") - (register-input-method - "chinese-wubi" "euc-cn" 'chinese-wbim-use-package - "五笔" "汉字五笔输入法" "wb.txt") - (require 'chinese-wbim-extra) - (global-set-key ";" 'chinese-wbim-insert-ascii)) - - (def-package! pangu-spacing :hook (doom-after-init . global-pangu-spacing-mode) :config diff --git a/modules/input/chinese/packages.el b/modules/input/chinese/packages.el index 5addf5fe0..ab5be7f1b 100644 --- a/modules/input/chinese/packages.el +++ b/modules/input/chinese/packages.el @@ -1,9 +1,7 @@ ;; -*- no-byte-compile: t; -*- ;;; input/chinese/packages.el -(if (featurep! +wubi) - (package! chinese-wbim) - (package! pyim)) +(package! pyim) (package! fcitx) (package! ace-pinyin) (package! pangu-spacing)