* lisp/org-src.el (org-src-font-lock-fontify-block): Replace anonymous faces with inheritance by lists of faces constructed by `font-lock-add-text-property`. This properly deals with cases when the source buffer's `face' property is already a list.
org-babel-trim' in favor of
string-match-p' instead of
cl' since