mirror of https://github.com/djcb/mu.git
mu4e: move all obsolete aliases to mu4e-obsolete
Unclutter the rest of the code a bit.
This commit is contained in:
Dirk-Jan C. Binnema
parent
4fc00ccf32
commit
68753f9e84
|
|
@ -45,6 +45,7 @@ mu4e_srcs=[
|
|||
'mu4e-main.el',
|
||||
'mu4e-mark.el',
|
||||
'mu4e-message.el',
|
||||
'mu4e-obsolete.el',
|
||||
'mu4e-org.el',
|
||||
'mu4e-search.el',
|
||||
'mu4e-server.el',
|
||||
|
|
|
|||
|
|
@ -59,11 +59,6 @@ Useful when this is not equal to the From: address."
|
|||
:type 'boolean
|
||||
:group 'mu4e-compose)
|
||||
|
||||
;; backward compatibility
|
||||
(make-obsolete-variable 'mu4e-reply-to-address
|
||||
'mu4e-compose-reply-to-address
|
||||
"v0.9.9")
|
||||
|
||||
(defcustom mu4e-compose-keep-self-cc nil
|
||||
"When non-nil. keep your e-mail address in Cc: when replying."
|
||||
:type 'boolean
|
||||
|
|
@ -74,8 +69,6 @@ Useful when this is not equal to the From: address."
|
|||
This is the message being replied to, forwarded or edited; used
|
||||
in `mu4e-compose-pre-hook'. For new messages, it is nil.")
|
||||
|
||||
(make-obsolete-variable 'mu4e-auto-retrieve-keys "no longer used." "1.3.1")
|
||||
|
||||
(defcustom mu4e-decryption-policy t
|
||||
"Policy for dealing with replying/forwarding encrypted parts.
|
||||
The setting is a symbol:
|
||||
|
|
@ -183,21 +176,6 @@ All `sign-*' options have a `encrypt-*' analogue."
|
|||
(const :tag "Encrypt replies to encrypted messages" encrypt-encrypted-replies))
|
||||
:group 'mu4e-compose)
|
||||
|
||||
(make-obsolete-variable 'mu4e-compose-crypto-reply-encrypted-policy "The use of the
|
||||
'mu4e-compose-crypto-reply-encrypted-policy' variable is deprecated.
|
||||
'mu4e-compose-crypto-policy' should be used instead" "2020-03-06")
|
||||
|
||||
(make-obsolete-variable 'mu4e-compose-crypto-reply-plain-policy "The use of the
|
||||
'mu4e-compose-crypto-reply-plain-policy' variable is deprecated.
|
||||
'mu4e-compose-crypto-policy' should be used instead"
|
||||
"2020-03-06")
|
||||
|
||||
(make-obsolete-variable 'mu4e-compose-crypto-reply-policy "The use of the
|
||||
'mu4e-compose-crypto-reply-policy' variable is deprecated.
|
||||
'mu4e-compose-crypto-reply-plain-policy' and
|
||||
'mu4e-compose-crypto-reply-encrypted-policy' should be used instead"
|
||||
"2017-09-02")
|
||||
|
||||
(defcustom mu4e-compose-format-flowed nil
|
||||
"Whether to compose messages to be sent as format=flowed.
|
||||
\(Or with long lines if variable `use-hard-newlines' is set to
|
||||
|
|
@ -253,9 +231,6 @@ mu4e-specific version of `message-signature'."
|
|||
:type 'boolean
|
||||
:group 'mu4e-compose)
|
||||
|
||||
(make-obsolete-variable 'mu4e-compose-auto-include-date
|
||||
"This is done unconditionally now" "1.3.5")
|
||||
|
||||
(defcustom mu4e-compose-in-new-frame nil
|
||||
"Whether to compose messages in a new frame."
|
||||
:type 'boolean
|
||||
|
|
|
|||
|
|
@ -653,9 +653,6 @@ space propertized with a `display' text property which expands to
|
|||
(mu4e~headers-truncate-field-precise field val width)
|
||||
(mu4e~headers-truncate-field-fast val width)))
|
||||
|
||||
(make-obsolete-variable 'mu4e-headers-field-properties-function
|
||||
"not used" "1.6.1")
|
||||
|
||||
(defsubst mu4e~headers-field-handler (f-w msg)
|
||||
"Create a description of the field of MSG described by F-W."
|
||||
(let* ((field (car f-w))
|
||||
|
|
|
|||
|
|
@ -43,10 +43,6 @@
|
|||
|
||||
;; Configuration
|
||||
|
||||
(define-obsolete-variable-alias
|
||||
'mu4e-main-buffer-hide-personal-addresses
|
||||
'mu4e-main-hide-personal-addresses "1.5.7")
|
||||
|
||||
(defvar mu4e-main-hide-personal-addresses nil
|
||||
"Whether to hide the personal address in the main view.
|
||||
|
||||
|
|
|
|||
|
|
@ -37,13 +37,6 @@
|
|||
(declare-function mu4e-personal-address-p "mu4e-contacts")
|
||||
(declare-function mu4e-make-temp-file "mu4e-helpers")
|
||||
|
||||
(make-obsolete-variable 'mu4e-html2text-command "No longer in use" "1.7.0")
|
||||
(make-obsolete-variable 'mu4e-view-prefer-html "No longer in use" "1.7.0")
|
||||
(make-obsolete-variable 'mu4e-view-html-plaintext-ratio-heuristic
|
||||
"No longer in use" "1.7.0")
|
||||
(make-obsolete-variable 'mu4e-message-body-rewrite-functions
|
||||
"No longer in use" "1.7.0")
|
||||
|
||||
;;; Message fields
|
||||
|
||||
(defsubst mu4e-message-field-raw (msg field)
|
||||
|
|
@ -198,9 +191,6 @@ Either in the headers buffer or the view buffer. Field is a
|
|||
symbol, see `mu4e-header-info'."
|
||||
(plist-get (mu4e-message-at-point) field))
|
||||
|
||||
;;; Html2Text
|
||||
(make-obsolete 'mu4e-shr2text "No longer in use" "1.7.0")
|
||||
|
||||
(defun mu4e-message-readable-path (&optional msg)
|
||||
"Get a readable path to MSG or raise an error.
|
||||
If MSG is nil, use `mu4e-message-at-point'."
|
||||
|
|
|
|||
|
|
@ -122,8 +122,6 @@ the query (for links starting with \"query:\")."
|
|||
(mu4e-search (match-string 1 link) current-prefix-arg))
|
||||
(t (mu4e-error "Unrecognized link type '%s'" link))))
|
||||
|
||||
(make-obsolete 'org-mu4e-open 'mu4e-org-open "1.3.6")
|
||||
|
||||
(defun mu4e-org-store-and-capture ()
|
||||
"Store a link to the current message or query.
|
||||
\(depending on `mu4e-org-link-query-in-headers-mode', and capture
|
||||
|
|
@ -132,9 +130,6 @@ it with org)."
|
|||
(call-interactively 'org-store-link)
|
||||
(org-capture))
|
||||
|
||||
(make-obsolete 'org-mu4e-store-and-capture
|
||||
'mu4e-org-store-and-capture "1.3.6")
|
||||
|
||||
;; install mu4e-link support.
|
||||
(org-link-set-parameters "mu4e"
|
||||
:follow #'mu4e-org-open
|
||||
|
|
|
|||
|
|
@ -40,8 +40,6 @@
|
|||
"Search-related settings."
|
||||
:group 'mu4e)
|
||||
|
||||
(define-obsolete-variable-alias 'mu4e-headers-results-limit
|
||||
'mu4e-search-results-limit "1.7.0")
|
||||
(defcustom mu4e-search-results-limit 500
|
||||
"Maximum number of results to show.
|
||||
This affects performance, especially when
|
||||
|
|
@ -51,15 +49,10 @@ Set to -1 for no limits."
|
|||
(integer :tag "Limit"))
|
||||
:group 'mu4e-search)
|
||||
|
||||
(define-obsolete-variable-alias 'mu4e-headers-full-search
|
||||
'mu4e-search-full "1.7.0")
|
||||
(defvar mu4e-search-full nil
|
||||
"Whether to search for all results.
|
||||
If this is nil, search for up to `mu4e-search-results-limit')")
|
||||
|
||||
|
||||
(define-obsolete-variable-alias 'mu4e-headers-show-threads
|
||||
'mu4e-search-threads "1.7.0")
|
||||
(defvar mu4e-search-threads t
|
||||
"Whether to calculate threads for the search results.")
|
||||
|
||||
|
|
@ -85,9 +78,6 @@ anything about the query, it just does text replacement."
|
|||
:type 'function
|
||||
:group 'mu4e-search)
|
||||
|
||||
(define-obsolete-variable-alias
|
||||
'mu4e-headers-search-bookmark-hook
|
||||
'mu4e-search-bookmark-hook "1.7.0")
|
||||
(defcustom mu4e-search-bookmark-hook nil
|
||||
"Hook run just after invoking a bookmarked search.
|
||||
|
||||
|
|
@ -101,8 +91,6 @@ folder and change the options for the search."
|
|||
:type 'hook
|
||||
:group 'mu4e-search)
|
||||
|
||||
(define-obsolete-variable-alias 'mu4e-headers-search-hook
|
||||
'mu4e-search-hook "1.7.0")
|
||||
(defcustom mu4e-search-hook nil
|
||||
"Hook run just before executing a new search operation.
|
||||
This function receives the query as its parameter, before any
|
||||
|
|
@ -155,23 +143,18 @@ show the message with MSGID."
|
|||
(let* ((prompt (mu4e-format (or prompt "Search for: ")))
|
||||
(expr
|
||||
(if (or (null expr) edit)
|
||||
(mu4e-read-query prompt expr)
|
||||
(mu4e-search-read-query prompt expr)
|
||||
expr)))
|
||||
(mu4e-mark-handle-when-leaving)
|
||||
(mu4e--search-execute expr ignore-history)
|
||||
(setq mu4e--search-msgid-target msgid
|
||||
mu4e--search-view-target show)))
|
||||
|
||||
(define-obsolete-function-alias 'mu4e-headers-search 'mu4e-search "1.7.0")
|
||||
|
||||
(defun mu4e-search-edit ()
|
||||
"Edit the last search expression."
|
||||
(interactive)
|
||||
(mu4e-search mu4e--search-last-query nil t))
|
||||
|
||||
(define-obsolete-function-alias 'mu4e-headers-search-edit
|
||||
'mu4e-search-edit "1.7.0")
|
||||
|
||||
(defun mu4e-search-bookmark (&optional expr edit)
|
||||
"Search using some bookmarked query EXPR.
|
||||
If EDIT is non-nil, let the user edit the bookmark before starting
|
||||
|
|
@ -183,17 +166,11 @@ the search."
|
|||
(run-hook-with-args 'mu4e-search-bookmark-hook expr)
|
||||
(mu4e-search expr (when edit "Edit bookmark: ") edit)))
|
||||
|
||||
(define-obsolete-function-alias 'mu4e-headers-search-bookmark
|
||||
'mu4e-search-bookmark "1.7.0")
|
||||
|
||||
(defun mu4e-search-bookmark-edit ()
|
||||
"Edit an existing bookmark before executing it."
|
||||
(interactive)
|
||||
(mu4e-search-bookmark nil t))
|
||||
|
||||
(define-obsolete-function-alias 'mu4e-headers-search-bookmark-edit
|
||||
'mu4e-search-bookmark-edit "1.7.0")
|
||||
|
||||
(defun mu4e-search-narrow(&optional filter)
|
||||
"Narrow the last search.
|
||||
Do so by appending search expression FILTER to the last search
|
||||
|
|
@ -208,9 +185,6 @@ query (effectively, \"widen\" it), with `mu4e-search-prev'."
|
|||
(mu4e-warn "There's nothing to filter"))
|
||||
(mu4e-search (format "(%s) AND (%s)" mu4e--search-last-query filter)))
|
||||
|
||||
(define-obsolete-function-alias 'mu4e-headers-search-narrow
|
||||
'mu4e-search-narrow "1.7.0")
|
||||
|
||||
;; (defun mu4e-headers-change-sorting (&optional field dir)
|
||||
;; "Change the sorting/threading parameters.
|
||||
;; FIELD is the field to sort by; DIR is a symbol: either 'ascending,
|
||||
|
|
@ -333,9 +307,6 @@ or `past'."
|
|||
(msgid (and msg (mu4e-message-field msg :message-id))))
|
||||
(mu4e-search mu4e--search-last-query nil nil t msgid)))
|
||||
|
||||
(define-obsolete-function-alias 'mu4e-headers-rerun-search
|
||||
'mu4e-search-rerun "1.7.0")
|
||||
|
||||
(defun mu4e--search-query-navigate (whence)
|
||||
"Execute the previous query from the query stacks.
|
||||
WHENCE determines where the query is taken from and is a symbol,
|
||||
|
|
@ -351,17 +322,11 @@ either `future' or `past'."
|
|||
(interactive)
|
||||
(mu4e--search-query-navigate 'future))
|
||||
|
||||
(define-obsolete-function-alias 'mu4e-headers-query-next
|
||||
'mu4e-search-next "1.7.0")
|
||||
|
||||
(defun mu4e-search-prev ()
|
||||
"Execute the previous query from the query stacks."
|
||||
(interactive)
|
||||
(mu4e--search-query-navigate 'past))
|
||||
|
||||
(define-obsolete-function-alias 'mu4e-headers-query-prev
|
||||
'mu4e-search-prev "1.7.0")
|
||||
|
||||
;; forget the past so we don't repeat it :/
|
||||
(defun mu4e-search-forget ()
|
||||
"Forget the search history."
|
||||
|
|
@ -370,9 +335,6 @@ either `future' or `past'."
|
|||
mu4e--search-query-future nil)
|
||||
(mu4e-message "Query history cleared"))
|
||||
|
||||
(define-obsolete-function-alias 'mu4e-headers-forget-queries
|
||||
'mu4e-search-forget "1.7.0")
|
||||
|
||||
(defun mu4e-last-query ()
|
||||
"Get the most recent query or nil if there is none."
|
||||
mu4e--search-last-query)
|
||||
|
|
@ -395,9 +357,6 @@ either `future' or `past'."
|
|||
(use-local-map mu4e-minibuffer-search-query-map))
|
||||
(read-string prompt initial-input 'mu4e--search-hist)))
|
||||
|
||||
(define-obsolete-function-alias 'mu4e-read-query
|
||||
'mu4e-search-read-query "1.7.0")
|
||||
|
||||
(defconst mu4e--search-query-keywords
|
||||
'("and" "or" "not"
|
||||
"from:" "to:" "cc:" "bcc:" "contact:" "recip:" "date:" "subject:" "body:"
|
||||
|
|
|
|||
|
|
@ -58,10 +58,6 @@ session."
|
|||
:type 'boolean
|
||||
:group 'mu4e)
|
||||
|
||||
(make-obsolete-variable
|
||||
'mu4e-maildir
|
||||
"determined by server; see `mu4e-root-maildir'." "1.3.8")
|
||||
|
||||
(defcustom mu4e-change-filenames-when-moving nil
|
||||
"Change message file names when moving them.
|
||||
|
||||
|
|
@ -107,8 +103,6 @@ passed the docid and the draft-path of the sent message.")
|
|||
The function is passed a message sexp as argument. See
|
||||
`mu4e--server-filter' for the format.")
|
||||
|
||||
(make-obsolete-variable 'mu4e-header-func "mu4e-headers-append-func" "1.7.4")
|
||||
|
||||
(defvar mu4e-headers-append-func nil
|
||||
"Function called with a list of headers to append.
|
||||
The function is passed a list of message plists as argument. See
|
||||
|
|
@ -139,10 +133,9 @@ from the server process.")
|
|||
"Function called for each (:pong type ....) sexp received.")
|
||||
|
||||
(defvar mu4e-contacts-func nil
|
||||
"A function called for each (:contacts (<list-of-contacts>)
|
||||
"A function called for each (:contacts (<list-of-contacts>))
|
||||
sexp received from the server process.")
|
||||
|
||||
(make-obsolete-variable 'mu4e-temp-func "No longer used" "1.7.0")
|
||||
|
||||
;;; Internal vars
|
||||
|
||||
|
|
|
|||
|
|
@ -304,9 +304,6 @@ run in the background; otherwise, pop up a window."
|
|||
(when (process-live-p proc)
|
||||
(kill-process proc t))))
|
||||
|
||||
(define-obsolete-function-alias 'mu4e-interrupt-update-mail
|
||||
'mu4e-kill-update-mail "1.0-alpha0")
|
||||
|
||||
(define-minor-mode mu4e-update-minor-mode
|
||||
"Mode for triggering mu4e updates."
|
||||
:global nil
|
||||
|
|
|
|||
|
|
@ -113,43 +113,6 @@ specified a function as viewer."
|
|||
:group 'mu4e-view)
|
||||
|
||||
|
||||
|
||||
|
||||
;;; Old options
|
||||
|
||||
;; Options from the old message view.
|
||||
(make-obsolete-variable 'mu4e-view-show-addresses
|
||||
"Unused with the new message view" "1.7.0")
|
||||
(make-obsolete-variable 'mu4e-view-wrap-lines nil "0.9.9-dev7")
|
||||
(make-obsolete-variable 'mu4e-view-hide-cited nil "0.9.9-dev7")
|
||||
(make-obsolete-variable 'mu4e-view-date-format
|
||||
"Unused with the new message view" "1.7.0")
|
||||
(make-obsolete-variable 'mu4e-view-image-max-width
|
||||
"Unused with the new message view" "1.7.0")
|
||||
(make-obsolete-variable 'mu4e-view-image-max-height
|
||||
"Unused with the new message view" "1.7.0")
|
||||
(make-obsolete-variable 'mu4e-save-multiple-attachments-without-asking
|
||||
"Unused with the new message view" "1.7.0")
|
||||
(make-obsolete-variable 'mu4e-view-attachment-assoc
|
||||
"Unused with the new message view" "1.7.0")
|
||||
(make-obsolete-variable 'mu4e-view-attachment-actions
|
||||
"See mu4e-view-mime-part-actions" "1.7.0")
|
||||
(make-obsolete-variable 'mu4e-view-header-field-keymap
|
||||
"Unused with the new message view" "1.7.0")
|
||||
(make-obsolete-variable 'mu4e-view-header-field-keymap
|
||||
"Unused with the new message view" "1.7.0")
|
||||
(make-obsolete-variable 'mu4e-view-contacts-header-keymap
|
||||
"Unused with the new message view" "1.7.0")
|
||||
(make-obsolete-variable 'mu4e-view-attachments-header-keymap
|
||||
"Unused with the new message view" "1.7.0")
|
||||
(make-obsolete-variable 'mu4e-imagemagick-identify nil "1.7.0")
|
||||
(make-obsolete-variable 'mu4e-view-show-images
|
||||
"No longer used" "1.7.0")
|
||||
(make-obsolete-variable 'mu4e-view-gnus "Old view is gone" "1.7.0")
|
||||
(make-obsolete-variable 'mu4e-view-use-gnus "Gnus view is the default" "1.5.10")
|
||||
|
||||
(make-obsolete-variable 'mu4e-cited-regexp "No longer used" "1.7.0")
|
||||
|
||||
|
||||
|
||||
;; Helpers
|
||||
|
|
@ -624,12 +587,6 @@ message."
|
|||
(defvar helm-comp-read-use-marked)
|
||||
(defvar-local mu4e~view-rendering nil)
|
||||
|
||||
(define-obsolete-variable-alias 'mu4e-view-blocked-images 'gnus-blocked-images
|
||||
"1.5.12")
|
||||
(define-obsolete-variable-alias 'mu4e-view-inhibit-images 'gnus-inhibit-images
|
||||
"1.5.12")
|
||||
;;; Main
|
||||
|
||||
;; remember the mime-handles, so we can clean them up when
|
||||
;; we quit this buffer.
|
||||
(defvar-local mu4e~gnus-article-mime-handles nil)
|
||||
|
|
|
|||
|
|
@ -26,11 +26,13 @@
|
|||
;;; Code:
|
||||
|
||||
(require 'mu4e-vars)
|
||||
(require 'mu4e-obsolete)
|
||||
(require 'mu4e-helpers)
|
||||
(require 'mu4e-folders)
|
||||
(require 'mu4e-context)
|
||||
(require 'mu4e-contacts)
|
||||
(require 'mu4e-headers)
|
||||
(require 'mu4e-search)
|
||||
(require 'mu4e-view)
|
||||
(require 'mu4e-compose)
|
||||
(require 'mu4e-bookmarks)
|
||||
|
|
|
|||
Loading…
Reference in New Issue