diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2021-08-03 19:02:11 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2021-08-03 19:02:11 -0400 |
| commit | b0d07396e8d970407a17388cdc207b9f3608f90e (patch) | |
| tree | fe4a9601dbe918455ada05a5b0da04c351c603d8 /lisp | |
| parent | 6535fd1fa9ac21238a168916249ac59677a6118e (diff) | |
| download | emacs-b0d07396e8d970407a17388cdc207b9f3608f90e.tar.gz emacs-b0d07396e8d970407a17388cdc207b9f3608f90e.tar.bz2 emacs-b0d07396e8d970407a17388cdc207b9f3608f90e.zip | |
* lisp/emacs-lisp/cl-generic.el (cl-generic-generalizers): Don't emit warning
Also remove "WARNING" annotations after confirming that he code was right.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/emacs-lisp/cl-generic.el | 12 | ||||
| -rw-r--r-- | lisp/frame.el | 6 |
2 files changed, 7 insertions, 11 deletions
diff --git a/lisp/emacs-lisp/cl-generic.el b/lisp/emacs-lisp/cl-generic.el index 941e436ff78..db5a5a0c89a 100644 --- a/lisp/emacs-lisp/cl-generic.el +++ b/lisp/emacs-lisp/cl-generic.el @@ -1161,7 +1161,12 @@ These match if the argument is `eql' to VAL." (let ((form (cadr specializer))) (puthash (if (or (not (symbolp form)) (macroexp-const-p form)) (eval form t) - (message "Quoting obsolete `eql' form: %S" specializer) + ;; FIXME: Compatibility with Emacs<28. For now emitting + ;; a warning would be annoying for third party packages + ;; which can't use the new form without breaking compatibility + ;; with older Emacsen, but in the future we should emit + ;; a warning. + ;; (message "Quoting obsolete `eql' form: %S" specializer) form) specializer cl--generic-eql-used)) (list cl--generic-eql-generalizer)) @@ -1274,11 +1279,6 @@ Used internally for the (major-mode MODE) context specializers." (cl-generic-define-context-rewriter major-mode (mode &rest modes) `(major-mode ,(if (consp mode) ;;E.g. could be (eql ...) - ;; WARNING: unsure whether this - ;; “could be (eql ...)” commentary (or code) - ;; should be adjusted - ;; following the (planned) changes to eql specializer. - ;; Bug #47327 (progn (cl-assert (null modes)) mode) `(derived-mode ,mode . ,modes)))) diff --git a/lisp/frame.el b/lisp/frame.el index 8c05ad2fe5c..146fe278b3e 100644 --- a/lisp/frame.el +++ b/lisp/frame.el @@ -36,11 +36,7 @@ as its argument.") (cl-generic-define-context-rewriter window-system (value) ;; If `value' is a `consp', it's probably an old-style specializer, ;; so just use it, and anyway `eql' isn't very useful on cons cells. - `(window-system ,(if (consp value) value - ;; WARNING: unsure whether this eql expression - ;; is actually an eql specializer. - ;; Bug #47327 - `(eql ',value)))) + `(window-system ,(if (consp value) value `(eql ',value)))) (cl-defmethod frame-creation-function (params &context (window-system nil)) ;; It's tempting to get rid of tty-create-frame-with-faces and turn it into |