Run prog-mode-hooks in C++ and elisp mode in Emacs 23
Merge pull request #36 from r-darwish/23-prog-hooks

Run prog-mode-hooks in C++ and elisp mode in Emacs 23
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into unstable