summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHilton Chain <hako@ultrarare.space>2022-09-22 12:58:38 +0800
committerGuix Patches Tester <>2022-09-22 06:06:36 +0100
commitd2b9544fc95ab752bcbeedb496b28086463047a2 (patch)
tree4139770d9c455b35b6b7996a2dd46aa4aae138c6
parent97e719593045f5541d062aece1a25379be56d24d (diff)
downloadguix-patches-d2b9544fc95ab752bcbeedb496b28086463047a2.tar
guix-patches-d2b9544fc95ab752bcbeedb496b28086463047a2.tar.gz
gnu: emacs-rime: Emit deprecation warning.
* gnu/packages/patches/emacs-rime-update-define-minor-mode-usage.patch: New file. * gnu/local.mk (dist_patch_DATA): Add patch. * gnu/packages/emacs-xyz.scm (emacs-rime)[patches]: Add emacs-rime-update-define-minor-mode-usage.patch
-rw-r--r--gnu/local.mk1
-rw-r--r--gnu/packages/emacs-xyz.scm6
-rw-r--r--gnu/packages/patches/emacs-rime-update-define-minor-mode-usage.patch38
3 files changed, 44 insertions, 1 deletions
diff --git a/gnu/local.mk b/gnu/local.mk
index ef1bae5f3c..82e980a272 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1051,6 +1051,7 @@ dist_patch_DATA = \
%D%/packages/patches/emacs-libgit-use-system-libgit2.patch \
%D%/packages/patches/emacs-lispy-fix-thread-last-test.patch \
%D%/packages/patches/emacs-polymode-fix-lexical-variable-error.patch \
+ %D%/packages/patches/emacs-rime-update-define-minor-mode-usage.patch \
%D%/packages/patches/emacs-source-date-epoch.patch \
%D%/packages/patches/emacs-telega-path-placeholder.patch \
%D%/packages/patches/emacs-telega-test-env.patch \
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 32e4c33f16..5811fb410a 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -29523,7 +29523,11 @@ REPL appropriate to the current major mode.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0z0iwsqr92g8ykxb51gkawwxwzx0faw0027zgdi7c38ngjqld237"))))
+ (base32 "0z0iwsqr92g8ykxb51gkawwxwzx0faw0027zgdi7c38ngjqld237"))
+ (patches
+ (search-patches
+ ;; NOTE: Cherry-picked from upstream, remove when bumping.
+ "emacs-rime-update-define-minor-mode-usage.patch"))))
(build-system emacs-build-system)
(arguments
'(#:include (cons "\\.so$" %default-include)
diff --git a/gnu/packages/patches/emacs-rime-update-define-minor-mode-usage.patch b/gnu/packages/patches/emacs-rime-update-define-minor-mode-usage.patch
new file mode 100644
index 0000000000..4f905ca0bf
--- /dev/null
+++ b/gnu/packages/patches/emacs-rime-update-define-minor-mode-usage.patch
@@ -0,0 +1,38 @@
+From 5c2ade217134f6f20cd405447af20825e5b44513 Mon Sep 17 00:00:00 2001
+From: tianshu <doglooksgood@gmail.com>
+Date: Sat, 11 Dec 2021 02:06:35 +0800
+Subject: [PATCH] update define-minor-mode usage
+
+---
+ rime.el | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/rime.el b/rime.el
+index 64a4d70..044ab97 100644
+--- a/rime.el
++++ b/rime.el
+@@ -1084,18 +1084,18 @@ Argument NAME ignored."
+ "Mode used in composition.
+
+ Should not be enabled manually."
+- nil
+- nil
+- nil
++ :lighter nil
++ :init-value nil
++ :keymap nil
+ (if rime-active-mode
+ (rime-active-mode--init)
+ (rime-active-mode--uninit)))
+
+ (define-minor-mode rime-mode
+ "Mode used when input method is activated."
+- nil
+- nil
+- rime-mode-map)
++ :lighter nil
++ :init-value nil
++ :keymap rime-mode-map)
+
+ ;;;###autoload
+ (register-input-method "rime" "euc-cn" 'rime-activate rime-title)