Fixed for works correctly in emacs 24.4
Merge branch 'nna774-fix'
Make zlc work correctly under Emacs < 24.4