summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/warnings.el
diff options
context:
space:
mode:
authorAndrea Corallo <akrl@sdf.org>2020-12-20 22:07:48 +0100
committerAndrea Corallo <akrl@sdf.org>2020-12-20 22:08:42 +0100
commitf244c2190259875d095be8508a959a61339263b8 (patch)
tree4e32bd399f4abe168bf3f18086cd36acfbca3df8 /lisp/emacs-lisp/warnings.el
parent72c1a41573a96a39482a001bfeb3230c471a5681 (diff)
parent1a7033f1f3de4ad8c1bfd68b54e6c9d8444a3bcc (diff)
downloademacs-f244c2190259875d095be8508a959a61339263b8.tar.gz
emacs-f244c2190259875d095be8508a959a61339263b8.tar.bz2
emacs-f244c2190259875d095be8508a959a61339263b8.zip
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'lisp/emacs-lisp/warnings.el')
-rw-r--r--lisp/emacs-lisp/warnings.el7
1 files changed, 5 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/warnings.el b/lisp/emacs-lisp/warnings.el
index f525ea433ad..28458847cc2 100644
--- a/lisp/emacs-lisp/warnings.el
+++ b/lisp/emacs-lisp/warnings.el
@@ -67,6 +67,7 @@ Level :debug is ignored by default (see `warning-minimum-level').")
Each element looks like (ALIAS . LEVEL) and defines ALIAS as
equivalent to LEVEL. LEVEL must be defined in `warning-levels';
it may not itself be an alias.")
+(make-obsolete-variable 'warning-level-aliases 'warning-levels "28.1")
(define-obsolete-variable-alias 'display-warning-minimum-level
'warning-minimum-level "28.1")
@@ -256,8 +257,10 @@ entirely by setting `warning-suppress-types' or
(setq level :warning))
(unless buffer-name
(setq buffer-name "*Warnings*"))
- (if (assq level warning-level-aliases)
- (setq level (cdr (assq level warning-level-aliases))))
+ (with-suppressed-warnings ((obsolete warning-level-aliases))
+ (when-let ((new (cdr (assq level warning-level-aliases))))
+ (warn "Warning level `%s' is obsolete; use `%s' instead" level new)
+ (setq level new)))
(or (< (warning-numeric-level level)
(warning-numeric-level warning-minimum-log-level))
(warning-suppress-p type warning-suppress-log-types)