closes #391: don't assume `declare-function'/ exists, it doesn't in emacs22
Merge remote-tracking branch 'upstream/master'