If these are not moot, here are suggested patch files and ChangeLog entries for `emacs/etc/emacs.bash' and `emacs/lisp/server.el' for the latest revisions on the CVS branch EMACS_22_BASE.