Clean up the emacs patch.  Over time we have fixed some parts of NaCl, so some changes are no longer needed, cleaned up other parts of the code, and we are backing out speculative fixes that we ended up not needing after all.
Clean up the emacs patch.  Over time we have fixed some parts of NaCl,
so some changes are no longer needed, cleaned up other parts of the code,
and we are backing out speculative fixes that we ended up not needing after
all.

R=bradnelson@chromium.org

BUG=

Review URL: https://codereview.chromium.org/758163006

Schibum/naclports,Schibum/naclports,yeyus/naclports,yeyus/naclports,yeyus/naclports,yeyus/naclports,Schibum/naclports,Schibum/naclports,Schibum/naclports,yeyus/naclports,yeyus/naclports,Schibum/naclports