mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-06 22:41:06 -08:00
Merge branch 'feature/type-hierarchy' into 'master'
This commit is contained in:
commit
c55694785e
9 changed files with 206 additions and 51 deletions
|
|
@ -170,7 +170,7 @@ The arg is an alist of: type specifier -> expected type specifier."
|
|||
;; 61
|
||||
((and atom (not symbol)) . atom)
|
||||
;; 62
|
||||
((and atom (not string)) . (or array sequence atom))
|
||||
((and atom (not string)) . (or array atom))
|
||||
;; 63 Conservative
|
||||
((and symbol (not (member foo))) . symbol)
|
||||
;; 64 Conservative
|
||||
|
|
@ -196,7 +196,7 @@ The arg is an alist of: type specifier -> expected type specifier."
|
|||
;; 74
|
||||
((and boolean (or number marker)) . nil)
|
||||
;; 75
|
||||
((and atom (or number marker)) . number-or-marker)
|
||||
((and atom (or number marker)) . (or integer-or-marker number-or-marker))
|
||||
;; 76
|
||||
((and symbol (or number marker)) . nil)
|
||||
;; 77
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue