contrib/cfengine.el: Support add-log-current-defun-function
Merge pull request #2019 from leoliu/master

contrib/cfengine.el: Support add-log-current-defun-function