(modeline-highlight): Rename from (the erroneous) `modeline-higilight'.

[bpt/emacs.git] / lisp / server.el

diff --git a/lisp/server.el b/lisp/server.el
index 534ba9f..0a5fc94 100644 (file)
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -123,7 +123,7 @@ If it is a frame, use the frame's selected window.
 It is not meaningful to set this to a specific frame or window with Custom.
 Only programs can do so."
   :group 'server
-  :version "21.4"
+  :version "22.1"
   :type '(choice (const :tag "Use selected window"
                        :match (lambda (widget value)
                                 (not (functionp value)))
@@ -282,7 +282,7 @@ Server mode runs a process that accepts commands from the
 `emacsclient' program.  See `server-start' and Info node `Emacs server'."
   :global t
   :group 'server
-  :version "21.4"
+  :version "22.1"
   ;; Fixme: Should this check for an existing server socket and do
   ;; nothing if there is one (for multiple Emacs sessions)?
   (server-start (not server-mode)))
@@ -325,11 +325,11 @@ PROC is the server process.  Format of STRING is \"PATH PATH PATH... \\n\"."
                       (setq request "")))))
           ;; ARG is a line number option.
           ((string-match "\\`\\+[0-9]+\\'" arg)
-           (setq lineno (string-to-int (substring arg 1))))
+           (setq lineno (string-to-number (substring arg 1))))
           ;; ARG is line number:column option.
           ((string-match "\\`+\\([0-9]+\\):\\([0-9]+\\)\\'" arg)
-           (setq lineno (string-to-int (match-string 1 arg))
-                 columnno (string-to-int (match-string 2 arg))))
+           (setq lineno (string-to-number (match-string 1 arg))
+                 columnno (string-to-number (match-string 2 arg))))
           (t
            ;; Undo the quoting that emacsclient does
            ;; for certain special characters.
@@ -346,7 +346,8 @@ PROC is the server process.  Format of STRING is \"PATH PATH PATH... \\n\"."
                        ;; Suppress the error rose when the pipe to PROC is closed.
                        (condition-case err
                            (process-send-region proc (point-min) (point-max))
-                         (file-error nil))
+                         (file-error nil)
+                         (error nil))
                        ))))
              ;; ARG is a file name.
              ;; Collapse multiple slashes to single slashes.