merging Emacs.app (NeXTstep port)

[gnu-emacs] / lisp / server.el

diff --git a/lisp/server.el b/lisp/server.el
index 90adaace1569b0487744596c08329b00a78bf31b..ff2cb1241f2cd38de82b9ea276d94ebdc9c1bdca 100644 (file)
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -12,10 +12,10 @@
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -23,9 +23,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -500,8 +498,9 @@ kill any existing server communications subprocess."
                       :filter 'server-process-filter
                       ;; We must receive file names without being decoded.
                       ;; Those are decoded by server-process-filter according
-                      ;; to file-name-coding-system.
-                      :coding 'raw-text
+                      ;; to file-name-coding-system.  Also don't get
+                      ;; confused by CRs since we don't quote them.
+                      :coding 'raw-text-unix
                       ;; The other args depend on the kind of socket used.
                       (if server-use-tcp
                           (list :family nil