[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/server.el,v
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/server.el,v |
Date: |
Wed, 01 Nov 2006 21:37:12 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Stefan Monnier <monnier> 06/11/01 21:37:12
Index: server.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/server.el,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -b -r1.115 -r1.116
--- server.el 30 Oct 2006 23:20:45 -0000 1.115
+++ server.el 1 Nov 2006 21:37:11 -0000 1.116
@@ -185,7 +185,7 @@
:version "21.1")
(or (assq 'server-buffer-clients minor-mode-alist)
- (setq minor-mode-alist (cons '(server-buffer-clients " Server")
minor-mode-alist)))
+ (push '(server-buffer-clients " Server") minor-mode-alist))
(defvar server-existing-buffer nil
"Non-nil means the buffer existed before the server was asked to visit it.
@@ -309,7 +309,8 @@
;; kill it dead!
(ignore-errors (delete-process server-process))
(ignore-errors
- ;; Delete the socket or authentication files made by previous server
invocations.
+ ;; Delete the socket or authentication files made by previous
+ ;; server invocations.
(if (eq (process-contact server-process :family) 'local)
(delete-file (expand-file-name server-name server-socket-dir))
(setq server-auth-key nil)
@@ -321,7 +322,8 @@
;; Now any previous server is properly stopped.
(unless leave-dead
;; Make sure there is a safe directory in which to place the socket.
- (server-ensure-safe-dir (if server-use-tcp server-auth-dir
server-socket-dir))
+ (server-ensure-safe-dir
+ (if server-use-tcp server-auth-dir server-socket-dir))
(when server-process
(server-log (message "Restarting server")))
(letf (((default-file-modes) ?\700))
@@ -336,7 +338,7 @@
;; Those are decoded by server-process-filter according
;; to file-name-coding-system.
:coding 'raw-text
- ;; The rest of the arguments depend on the kind of socket
used
+ ;; The rest of the args depends on the kind of socket used.
(if server-use-tcp
(list :family nil
:service t
@@ -344,20 +346,22 @@
:plist '(:authenticated nil))
(list :family 'local
:service (expand-file-name server-name
server-socket-dir)
- :plist '(:authenticated t))))))
+ :plist '(:authenticated t)))))
(unless server-process (error "Could not start server process"))
(when server-use-tcp
(setq server-auth-key
(loop
- ;; The auth key is a 64-byte string of random chars in the
range `!'..`~'.
+ ;; The auth key is a 64-byte string of random chars in the
+ ;; range `!'..`~'.
for i below 64
collect (+ 33 (random 94)) into auth
finally return (concat auth)))
(with-temp-file (expand-file-name server-name server-auth-dir)
(set-buffer-multibyte nil)
(setq buffer-file-coding-system 'no-conversion)
- (insert (format-network-address (process-contact server-process
:local))
- "\n" server-auth-key)))))
+ (insert (format-network-address
+ (process-contact server-process :local))
+ "\n" server-auth-key))))))
;;;###autoload
(define-minor-mode server-mode
@@ -444,7 +448,8 @@
(let ((standard-output (current-buffer)))
(if errorp (princ "error: "))
(pp v)
- ;; Suppress the error rose when the pipe to PROC is
closed.
+ ;; Suppress the error signalled when the pipe to
+ ;; PROC is closed.
(condition-case err
(process-send-region proc (point-min) (point-max))
(file-error nil)
- [Emacs-diffs] Changes to emacs/lisp/server.el,v,
Stefan Monnier <=
- [Emacs-diffs] Changes to emacs/lisp/server.el,v, Juanma Barranquero, 2006/11/01
- [Emacs-diffs] Changes to emacs/lisp/server.el,v, Stefan Monnier, 2006/11/02
- [Emacs-diffs] Changes to emacs/lisp/server.el,v, Juanma Barranquero, 2006/11/02
- [Emacs-diffs] Changes to emacs/lisp/server.el,v, Juanma Barranquero, 2006/11/07
- [Emacs-diffs] Changes to emacs/lisp/server.el,v, Juanma Barranquero, 2006/11/10
- [Emacs-diffs] Changes to emacs/lisp/server.el,v, Juanma Barranquero, 2006/11/11
- [Emacs-diffs] Changes to emacs/lisp/server.el,v, Juanma Barranquero, 2006/11/12
- [Emacs-diffs] Changes to emacs/lisp/server.el,v, Stefan Monnier, 2006/11/27