[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/vm fd06820502 4/5: Use `cl-lib` rather than the deprecated
|
From: |
ELPA Syncer |
|
Subject: |
[nongnu] elpa/vm fd06820502 4/5: Use `cl-lib` rather than the deprecated `cl` |
|
Date: |
Wed, 10 Jul 2024 13:01:22 -0400 (EDT) |
branch: elpa/vm
commit fd068205022058f1b19102a8cc83d265128360f4
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Commit: Stefan Monnier <monnier@iro.umontreal.ca>
Use `cl-lib` rather than the deprecated `cl`
Also, move the `require`s to where `cl-lib` functionality is actually used.
---
lisp/vm-avirtual.el | 3 ---
lisp/vm-build.el | 1 -
lisp/vm-delete.el | 3 ++-
lisp/vm-digest.el | 2 +-
lisp/vm-folder.el | 9 +++++----
lisp/vm-imap.el | 7 ++++---
lisp/vm-message.el | 4 ++--
lisp/vm-mime.el | 13 +++++++------
lisp/vm-motion.el | 3 ++-
lisp/vm-pcrisis.el | 1 -
lisp/vm-pgg.el | 1 -
lisp/vm-pop.el | 3 ++-
lisp/vm-reply.el | 3 ++-
lisp/vm-rfaddons.el | 7 +++----
lisp/vm-serial.el | 11 +++--------
lisp/vm-thread.el | 7 ++++---
lisp/vm-w3.el | 1 -
lisp/vm.el | 33 +++++++++++++++++----------------
18 files changed, 54 insertions(+), 58 deletions(-)
diff --git a/lisp/vm-avirtual.el b/lisp/vm-avirtual.el
index 730b1ba75e..4d8d8f5335 100644
--- a/lisp/vm-avirtual.el
+++ b/lisp/vm-avirtual.el
@@ -145,9 +145,6 @@
:group 'vm-ext)
;;----------------------------------------------------------------------------
-(eval-when-compile
- (require 'cl))
-
(eval-and-compile
(require 'regexp-opt)
(require 'time-date)
diff --git a/lisp/vm-build.el b/lisp/vm-build.el
index 00ee546287..93709f1ee0 100644
--- a/lisp/vm-build.el
+++ b/lisp/vm-build.el
@@ -56,7 +56,6 @@
;; (put 'inhibit-local-variables 'byte-obsolete-variable nil)
;; Preload these to get macros right
-(require 'cl)
(require 'sendmail)
(when (featurep 'xemacs)
(require 'timer-funcs))
diff --git a/lisp/vm-delete.el b/lisp/vm-delete.el
index 96d656d445..b3c54a714b 100644
--- a/lisp/vm-delete.el
+++ b/lisp/vm-delete.el
@@ -26,6 +26,7 @@
(require 'vm-macro)
(eval-when-compile
+ (require 'cl-lib)
(require 'vm-misc)
(require 'vm-summary)
(require 'vm-folder)
@@ -378,7 +379,7 @@ unmarked messages are not hashed or considerd for deletion."
del-count))
;;;###autoload
-(defun* vm-expunge-folder (&key (quiet nil)
+(cl-defun vm-expunge-folder (&key (quiet nil)
((:just-these-messages message-list)
nil ; default value
just-these-messages))
diff --git a/lisp/vm-digest.el b/lisp/vm-digest.el
index 75db070663..9a6ab3fb09 100644
--- a/lisp/vm-digest.el
+++ b/lisp/vm-digest.el
@@ -100,7 +100,7 @@ to find out how KEEP-LIST and DISCARD-REGEXP are used."
))
;;;###autoload
-(defun* vm-mime-encapsulate-messages (message-list &key
+(cl-defun vm-mime-encapsulate-messages (message-list &key
(keep-list nil)
(discard-regexp "none")
(always-use-digest nil))
diff --git a/lisp/vm-folder.el b/lisp/vm-folder.el
index 5c5b515d90..fdfa7a6077 100644
--- a/lisp/vm-folder.el
+++ b/lisp/vm-folder.el
@@ -27,6 +27,7 @@
(require 'vm-macro)
(eval-when-compile
+ (require 'cl-lib)
(require 'vm-misc)
(require 'vm-summary)
(require 'vm-window)
@@ -1204,7 +1205,7 @@ vm-folder-type is initialized here."
;; are ordered according to the order of the keep list.
;;;###autoload
-(defun* vm-reorder-message-headers (message ; &optional
+(cl-defun vm-reorder-message-headers (message ; &optional
&key (keep-list nil)
(discard-regexp nil))
(interactive
@@ -2221,7 +2222,7 @@ FOR-OTHER-FOLDER indicates <something unknown>. USR
2010-03-06"
-(defun* vm-stuff-folder-data (&key interactive abort-if-input-pending)
+(cl-defun vm-stuff-folder-data (&key interactive abort-if-input-pending)
"Stuff the soft and cached data of all the messages that have the
stuff-flag set in the current folder.
Keyword parameter INTERACTIVE says whether the stuffing is being done
@@ -4719,7 +4720,7 @@ files."
(vm-inform 5 "%s: No messages gathered." folder)))))))
;; returns list of new messages if there were any new messages, nil otherwise
-(defun* vm-assimilate-new-messages (&key
+(cl-defun vm-assimilate-new-messages (&key
(read-attributes t) (run-hooks t)
gobble-order labels)
;; We are only guessing what this function does. USR, 2010-05-20
@@ -5413,7 +5414,7 @@ thread are retrieved."
(vm-update-summary-and-mode-line))))
)))
-(defun* vm-retrieve-real-message-body (mm &key
+(cl-defun vm-retrieve-real-message-body (mm &key
(fetch nil) (register nil)
(fail nil))
"Retrieve the body of a real message MM from its external
diff --git a/lisp/vm-imap.el b/lisp/vm-imap.el
index dd507bd07f..81d483b395 100644
--- a/lisp/vm-imap.el
+++ b/lisp/vm-imap.el
@@ -28,6 +28,7 @@
(require 'vm-macro)
(eval-when-compile
+ (require 'cl-lib)
(require 'sendmail)
(require 'vm-misc))
@@ -1161,7 +1162,7 @@ of the current folder, or nil if none has been recorded."
;;;###autoload
-(defun* vm-imap-make-session (source interactive &key
+(cl-defun vm-imap-make-session (source interactive &key
(folder-buffer nil)
(purpose nil)
(retry nil))
@@ -3378,7 +3379,7 @@ messages previously retrieved are ignored."
(vm-inform 1 "VM working in offline mode")))
;;;###autoload
-(defun* vm-imap-synchronize-folder (&key
+(cl-defun vm-imap-synchronize-folder (&key
(interactive nil)
(do-remote-expunges nil)
(do-local-expunges nil)
@@ -3939,7 +3940,7 @@ cached tables. If there is no cached data, return nil.
USR, 2012-10-19"
(car (symbol-value uid-sym)))
(error nil))))
-(defun* vm-imap-save-attributes (&optional &key
+(cl-defun vm-imap-save-attributes (&optional &key
(interactive nil)
(all-flags nil))
"* Save the attributes of changed messages to the IMAP folder.
diff --git a/lisp/vm-message.el b/lisp/vm-message.el
index c368953da6..ab29cdd5c5 100644
--- a/lisp/vm-message.el
+++ b/lisp/vm-message.el
@@ -25,7 +25,7 @@
(provide 'vm-message)
(require 'vm-macro)
-(require 'cl)
+(eval-when-compile (require 'cl-lib))
(declare-function vm-mime-encode-words-in-string "vm-mime" (string))
(declare-function vm-reencode-mime-encoded-words-in-string
@@ -738,7 +738,7 @@ works in all VM buffers."
(defsubst vm-virtual-message-p (m)
(not (eq m (vm-real-message-of m))))
-(defun* vm-update-virtual-messages (m &key message-changing)
+(cl-defun vm-update-virtual-messages (m &key message-changing)
"Update all the virtual messages of M to reflect the changes made to
the headers/body of M."
(save-excursion
diff --git a/lisp/vm-mime.el b/lisp/vm-mime.el
index cd89efcaf3..c6e8df6d65 100644
--- a/lisp/vm-mime.el
+++ b/lisp/vm-mime.el
@@ -29,6 +29,7 @@
(require 'vm-misc))
(eval-when-compile
+ (require 'cl-lib)
(require 'vm-minibuf)
(require 'vm-toolbar)
(require 'vm-mouse)
@@ -1159,7 +1160,7 @@ previous mime decoding."
(vm-matched-header-contents)
nil )))))
-(defun* vm-mime-parse-entity (&optional m &key
+(cl-defun vm-mime-parse-entity (&optional m &key
(default-type nil)
(default-encoding nil)
(passing-message-only nil))
@@ -1442,7 +1443,7 @@ PASSING-MESSAGE-ONLY is a boolean argument that says that
VM is only
'message-symbol (vm-mime-make-message-symbol m)
)))))))
-(defun* vm-mime-parse-entity-safe (&optional m &key
+(cl-defun vm-mime-parse-entity-safe (&optional m &key
(default-type nil)
(default-encoding nil)
(passing-message-only nil))
@@ -2474,7 +2475,7 @@ assuming that it is text."
;; unwind-protection
(when work-buffer (kill-buffer work-buffer)))))
-(defun* vm-mime-should-display-button (layout &key ignore-content-disposition)
+(cl-defun vm-mime-should-display-button (layout &key
ignore-content-disposition)
"Checks whether MIME object with LAYOUT should be displayed as
a button. Optional keyword argument IGNORE-CONTENT-DISPOSITION
says whether the Content-Disposition header of the MIME object
@@ -4861,7 +4862,7 @@ buffer for message composition is queried from the
minibufer."
;;----------------------------------------------------------------------------
;;;###autoload
-(defun* vm-mime-operate-on-attachments (count &key
+(cl-defun vm-mime-operate-on-attachments (count &key
((:name action-name))
((:action action))
((:included types))
@@ -5280,7 +5281,7 @@ the front and placing the image there as the display text
property.
':type 'xpm
':file file))))))))
-(defun* vm-mime-insert-button (&key caption action layout (disposable nil))
+(cl-defun vm-mime-insert-button (&key caption action layout (disposable nil))
"Display a button for a mime object, using CAPTION as the label (a
string) and ACTION as the default action (a function). The mime object
is described by LAYOUT. If DISPOSABLE is true, then the button will
@@ -6404,7 +6405,7 @@ COMPOSITION's name will be read from the minibuffer."
'vm-attach-object-to-composition "8.2.0")
-(defun* vm-attach-object (object &key type params description
+(cl-defun vm-attach-object (object &key type params description
(mimed nil)
(disposition '("unspecified"))
(no-suggested-filename nil))
diff --git a/lisp/vm-motion.el b/lisp/vm-motion.el
index 97c6a09a72..81ca29dbcb 100644
--- a/lisp/vm-motion.el
+++ b/lisp/vm-motion.el
@@ -26,6 +26,7 @@
(require 'vm-macro)
(eval-when-compile
+ (require 'cl-lib)
(require 'vm-misc)
(require 'vm-minibuf)
(require 'vm-folder)
@@ -37,7 +38,7 @@
(declare-function vm-so-sortable-subject "vm-sort" (message))
-(defun* vm-record-and-change-message-pointer (old new &key present)
+(cl-defun vm-record-and-change-message-pointer (old new &key present)
"Change the `vm-message-pointer' of the folder from OLD to NEW, both
of which must be pointers into the `vm-message-list'.
If the keyword argument PRESENT is t, then update the presentation
diff --git a/lisp/vm-pcrisis.el b/lisp/vm-pcrisis.el
index 02a68b649e..3071c9a5f8 100644
--- a/lisp/vm-pcrisis.el
+++ b/lisp/vm-pcrisis.el
@@ -46,7 +46,6 @@
(require 'vm-reply))
(eval-when-compile
;; get the macros we need.
- (require 'cl)
(condition-case e
(progn
(require 'regexp-opt)
diff --git a/lisp/vm-pgg.el b/lisp/vm-pgg.el
index b42268c71e..b6159d605c 100644
--- a/lisp/vm-pgg.el
+++ b/lisp/vm-pgg.el
@@ -111,7 +111,6 @@
(declare-function rfc822-addresses "ext:rfc822" (header-text))
(eval-when-compile
- (require 'cl)
;; avoid warnings
(defvar vm-mode-line-format)
(defvar vm-message-pointer)
diff --git a/lisp/vm-pop.el b/lisp/vm-pop.el
index 6bd26c6a2c..48f5482f92 100644
--- a/lisp/vm-pop.el
+++ b/lisp/vm-pop.el
@@ -27,6 +27,7 @@
;; For function declarations
(eval-when-compile
+ (require 'cl-lib)
(require 'vm-misc)
(require 'vm-folder)
(require 'vm-summary)
@@ -1132,7 +1133,7 @@ LOCAL-EXPUNGE-LIST: A list of message descriptors for
messages in the
(list retrieve-list local-expunge-list)))
;;;###autoload
-(defun* vm-pop-synchronize-folder (&key
+(cl-defun vm-pop-synchronize-folder (&key
(interactive nil)
(do-remote-expunges nil)
(do-local-expunges nil)
diff --git a/lisp/vm-reply.el b/lisp/vm-reply.el
index 0c56696d40..65265f09fc 100644
--- a/lisp/vm-reply.el
+++ b/lisp/vm-reply.el
@@ -69,6 +69,7 @@
(require 'vm-macro)
(eval-when-compile
+ (require 'cl-lib)
(require 'vm-misc)
(require 'vm-minibuf)
(require 'vm-menu)
@@ -1679,7 +1680,7 @@ address is used."
;;;###autoload
-(defun* vm-mail-internal (&key buffer-name to guessed-to subject
+(cl-defun vm-mail-internal (&key buffer-name to guessed-to subject
in-reply-to cc references newsgroups)
"Create a message buffer and set it up according to args.
Fills in the headers as given by the arguments.
diff --git a/lisp/vm-rfaddons.el b/lisp/vm-rfaddons.el
index e15011bb1c..e5e6618a31 100644
--- a/lisp/vm-rfaddons.el
+++ b/lisp/vm-rfaddons.el
@@ -64,6 +64,7 @@
(require 'vm-version)
(eval-when-compile
+ (require 'cl-lib)
(require 'vm-misc)
(require 'vm-folder)
(require 'vm-summary)
@@ -101,7 +102,6 @@
(declare-function vm-folder-buffers "ext:vm" (&optional non-virtual))
(eval-when-compile
- (require 'cl)
(vm-load-features '(regexp-opt bbdb bbdb-vm))
;; gnus-group removed from features because it gives errors. USR, 2011-01-26
)
@@ -898,9 +898,8 @@ which should be attached, when empty all files will be
attached.
When called with a prefix arg it will do a literal match instead of a regexp
match. (Rob F)"
(interactive
- ;; temporarily override substitute-in-file-name. but why?
- ;; flet is obsolete from Emacs 24.3; need to use cl-flet
- (flet ((substitute-in-file-name (file) file))
+ ;; FIXME: Temporarily override substitute-in-file-name. but why?
+ (cl-letf (((symbol-function 'substitute-in-file-name) #'identity))
(let ((file (vm-read-file-name
"Attach files matching regexp: "
(or vm-mime-all-attachments-directory
diff --git a/lisp/vm-serial.el b/lisp/vm-serial.el
index b1b58f5a82..be5fb683f5 100644
--- a/lisp/vm-serial.el
+++ b/lisp/vm-serial.el
@@ -81,9 +81,7 @@
:group 'vm-ext)
(eval-when-compile
- (require 'cl))
-
-(eval-when-compile
+ (require 'cl-lib)
(require 'vm-misc)
(require 'vm-mime))
@@ -800,11 +798,8 @@ questions will bother you!"
(let* ((work-buffer
(save-excursion
(let ((vm-frame-per-composition nil))
- ;; temporarily override vm-display; why?
- ;; flet is obsolete in Emacs 24.3; use cl-flet instead
- (cl-flet ((vm-display (buffer display commands configs
- &optional do-not-raise)
- nil))
+ ;; FIXME: Temporarily override vm-display; why?
+ (cl-letf (((symbol-function 'vm-display) #'ignore))
(vm-mail-internal :buffer-name vm-serial-send-mail-buffer))
(get-buffer vm-serial-send-mail-buffer))))
(source-buffer (current-buffer))
diff --git a/lisp/vm-thread.el b/lisp/vm-thread.el
index 234032236a..8d258c6dbc 100644
--- a/lisp/vm-thread.el
+++ b/lisp/vm-thread.el
@@ -27,6 +27,7 @@
;; For function declarations
(eval-when-compile
+ (require 'cl-lib)
(require 'vm-misc)
(require 'vm-folder)
(require 'vm-motion)
@@ -284,7 +285,7 @@ youngest or oldest date in its thread. CRITERION must be
one of
(defsubst vm-ts-set-messages-of (subject-sym ml)
(aset (symbol-value subject-sym) 3 ml))
-(defun* vm-ts-set (subject-sym &key root root-date members messages)
+(cl-defun vm-ts-set (subject-sym &key root root-date members messages)
(let ((vec (symbol-value subject-sym)))
(aset vec 0 root)
(aset vec 1 root-date)
@@ -1091,7 +1092,7 @@ symbols interned in vm-thread-obarray."
;; message must be a real (non-virtual) message
;;;###autoload
-(defun* vm-unthread-message-and-mirrors (message &key message-changing)
+(cl-defun vm-unthread-message-and-mirrors (message &key message-changing)
"Removes MESSAGE and all its mirrored messages from their
current threads. If optional argument MESSAGE-CHANGING is
non-nil, then forget information that might be different if the
@@ -1114,7 +1115,7 @@ The full functionality of this function is not entirely
clear.
(cons message (vm-virtual-messages-of message)))))
;;;###autoload
-(defun* vm-unthread-message (m &key message-changing)
+(cl-defun vm-unthread-message (m &key message-changing)
"Removes message M from its thread. If optional argument
MESSAGE-CHANGING is non-nil, then forget information that might
be different if the message contents changed. The message will be
diff --git a/lisp/vm-w3.el b/lisp/vm-w3.el
index 4153b58458..a6e81497bc 100644
--- a/lisp/vm-w3.el
+++ b/lisp/vm-w3.el
@@ -26,7 +26,6 @@
;;; Code:
(eval-when-compile
- (require 'cl)
(require 'vm-mime)
)
diff --git a/lisp/vm.el b/lisp/vm.el
index 0541d86494..0a5543c530 100644
--- a/lisp/vm.el
+++ b/lisp/vm.el
@@ -8,6 +8,7 @@
;; Version: 8.3.0snapshot
;; Maintainer: viewmail-info@nongnu.org
;; URL: https://gitlab.com/emacs-vm/vm
+;; Package-Requires: ((cl-lib "0.5"))
;;
;; This program is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
@@ -39,6 +40,7 @@
;; For function declarations
(eval-when-compile
+ (require 'cl-lib)
(require 'vm-misc)
(require 'vm-folder)
(require 'vm-summary)
@@ -76,12 +78,11 @@
;; Ensure that vm-autoloads is loaded in case the user is using VM 7.x
;; autoloads
-(eval-when (load)
- (if (not (featurep 'xemacs))
- (require 'vm-autoloads)))
+(if (not (featurep 'xemacs))
+ (require 'vm-autoloads))
;;;###autoload
-(defun* vm (&optional folder &key read-only interactive
+(cl-defun vm (&optional folder &key read-only interactive
access-method reload just-visit)
"Read mail under Emacs.
Optional first arg FOLDER specifies the folder to visit. It can
@@ -485,7 +486,7 @@ deleted messages. Use `###' to expunge deleted messages."
(vm-gobble-labels))
;;;###autoload
-(defun* vm-other-frame (&optional folder read-only
+(cl-defun vm-other-frame (&optional folder read-only
&key interactive)
"Like vm, but run in a newly created frame."
(interactive (list nil current-prefix-arg))
@@ -502,7 +503,7 @@ deleted messages. Use `###' to expunge deleted messages."
(vm-set-hooks-for-frame-deletion)))
;;;###autoload
-(defun* vm-other-window (&optional folder read-only
+(cl-defun vm-other-window (&optional folder read-only
&key interactive)
"Like vm, but run in a different window."
(interactive (list nil current-prefix-arg))
@@ -534,7 +535,7 @@ Customize VM by setting variables and store them in the
`vm-init-file'."
(vm-display nil nil '(vm-mode) '(vm-mode)))
;;;###autoload
-(defun* vm-visit-folder (folder &optional read-only
+(cl-defun vm-visit-folder (folder &optional read-only
&key interactive just-visit)
"Visit a mail file.
VM will parse and present its messages to you in the usual way.
@@ -600,7 +601,7 @@ message-pointer, no retrieval of new mail."
:just-visit just-visit)))
;;;###autoload
-(defun* vm-visit-folder-other-frame (folder &optional read-only
+(cl-defun vm-visit-folder-other-frame (folder &optional read-only
&key interactive)
"Like vm-visit-folder, but run in a newly created frame."
(interactive
@@ -633,7 +634,7 @@ message-pointer, no retrieval of new mail."
(vm-set-hooks-for-frame-deletion)))
;;;###autoload
-(defun* vm-visit-folder-other-window (folder &optional read-only
+(cl-defun vm-visit-folder-other-window (folder &optional read-only
&key interactive)
"Like vm-visit-folder, but run in a different window."
(interactive
@@ -665,7 +666,7 @@ message-pointer, no retrieval of new mail."
(vm-visit-folder folder read-only :interactive interactive)))
;;;###autoload
-(defun* vm-visit-thunderbird-folder (folder &optional read-only
+(cl-defun vm-visit-thunderbird-folder (folder &optional read-only
&key interactive)
"Visit a mail file maintained by Thunderbird.
VM will parse and present its messages to you in the usual way.
@@ -718,7 +719,7 @@ of messages is carried out preferentially to other
Thunderbird folders."
)
;;;###autoload
-(defun* vm-visit-pop-folder (folder &optional read-only
+(cl-defun vm-visit-pop-folder (folder &optional read-only
&key interactive)
"Visit a POP mailbox.
VM will present its messages to you in the usual way. Messages
@@ -770,7 +771,7 @@ visited folder."
:interactive interactive :read-only read-only )))
;;;###autoload
-(defun* vm-visit-pop-folder-other-frame (folder &optional read-only
+(cl-defun vm-visit-pop-folder-other-frame (folder &optional read-only
&key interactive)
"Like vm-visit-pop-folder, but run in a newly created frame."
(interactive
@@ -802,7 +803,7 @@ visited folder."
(vm-set-hooks-for-frame-deletion)))
;;;###autoload
-(defun* vm-visit-pop-folder-other-window (folder &optional read-only
+(cl-defun vm-visit-pop-folder-other-window (folder &optional read-only
&key interactive)
"Like vm-visit-pop-folder, but run in a different window."
(interactive
@@ -833,7 +834,7 @@ visited folder."
(vm-visit-pop-folder folder read-only :interactive interactive)))
;;;###autoload
-(defun* vm-visit-imap-folder (folder &optional read-only
+(cl-defun vm-visit-imap-folder (folder &optional read-only
&key interactive)
"Visit a IMAP mailbox.
VM will present its messages to you in the usual way. Messages
@@ -879,7 +880,7 @@ visited folder."
:interactive interactive :read-only read-only))
;;;###autoload
-(defun* vm-visit-imap-folder-other-frame (folder &optional read-only
+(cl-defun vm-visit-imap-folder-other-frame (folder &optional read-only
&key interactive)
"Like vm-visit-imap-folder, but run in a newly created frame."
(interactive
@@ -905,7 +906,7 @@ visited folder."
(vm-set-hooks-for-frame-deletion)))
;;;###autoload
-(defun* vm-visit-imap-folder-other-window (folder &optional read-only
+(cl-defun vm-visit-imap-folder-other-window (folder &optional read-only
&key interactive)
"Like vm-visit-imap-folder, but run in a different window."
(interactive