[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 2dd5fc8 1/4: Make `gnus-define-keymap' obsolete and adjust caller
From: |
Lars Ingebrigtsen |
Subject: |
master 2dd5fc8 1/4: Make `gnus-define-keymap' obsolete and adjust caller |
Date: |
Wed, 6 Oct 2021 06:08:01 -0400 (EDT) |
branch: master
commit 2dd5fc85d134a35877beac6dd9750f58071e82cf
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>
Make `gnus-define-keymap' obsolete and adjust caller
* lisp/gnus/gnus-kill.el (gnus-kill-file-mode-map): Use
`define-keymap'.
* lisp/gnus/gnus-util.el (gnus-define-keymap): Make obsolete.
---
lisp/gnus/gnus-kill.el | 21 +++++++++------------
lisp/gnus/gnus-util.el | 2 +-
2 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/lisp/gnus/gnus-kill.el b/lisp/gnus/gnus-kill.el
index 525823e..7e589c5 100644
--- a/lisp/gnus/gnus-kill.el
+++ b/lisp/gnus/gnus-kill.el
@@ -66,18 +66,15 @@ of time."
;;; Gnus Kill File Mode
;;;
-(defvar gnus-kill-file-mode-map
- (let ((map (make-sparse-keymap)))
- (set-keymap-parent map emacs-lisp-mode-map)
- (gnus-define-keymap map
- "\C-c\C-k\C-s" gnus-kill-file-kill-by-subject
- "\C-c\C-k\C-a" gnus-kill-file-kill-by-author
- "\C-c\C-k\C-t" gnus-kill-file-kill-by-thread
- "\C-c\C-k\C-x" gnus-kill-file-kill-by-xref
- "\C-c\C-a" gnus-kill-file-apply-buffer
- "\C-c\C-e" gnus-kill-file-apply-last-sexp
- "\C-c\C-c" gnus-kill-file-exit)
- map))
+(defvar-keymap gnus-kill-file-mode-map
+ :parent emacs-lisp-mode-map
+ "\C-c\C-k\C-s" #'gnus-kill-file-kill-by-subject
+ "\C-c\C-k\C-a" #'gnus-kill-file-kill-by-author
+ "\C-c\C-k\C-t" #'gnus-kill-file-kill-by-thread
+ "\C-c\C-k\C-x" #'gnus-kill-file-kill-by-xref
+ "\C-c\C-a" #'gnus-kill-file-apply-buffer
+ "\C-c\C-e" #'gnus-kill-file-apply-last-sexp
+ "\C-c\C-c" #'gnus-kill-file-exit)
(define-derived-mode gnus-kill-file-mode emacs-lisp-mode "Kill"
"Major mode for editing kill files.
diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el
index 5bf2869..ab4c423 100644
--- a/lisp/gnus/gnus-util.el
+++ b/lisp/gnus/gnus-util.el
@@ -315,7 +315,7 @@ Symbols are also allowed; their print names are used
instead."
(defmacro gnus-define-keymap (keymap &rest plist)
"Define all keys in PLIST in KEYMAP."
- (declare (indent 1))
+ (declare (obsolete define-keymap "29.1") (indent 1))
`(gnus-define-keys-1 ,keymap (quote ,plist)))
(defun gnus-define-keys-1 (keymap plist &optional safe)