HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
server.el (server-visit-files): Run pre-command-hook and
[bpt/emacs.git]
/
lisp
/
server.el
diff --git
a/lisp/server.el
b/lisp/server.el
index
1ac2fb5
..
f0e88d0
100644
(file)
--- a/
lisp/server.el
+++ b/
lisp/server.el
@@
-563,9
+563,9
@@
server or call `M-x server-force-delete' to forcibly disconnect it.")
:coding 'raw-text-unix
;; The other args depend on the kind of socket used.
(if server-use-tcp
:coding 'raw-text-unix
;; The other args depend on the kind of socket used.
(if server-use-tcp
- (list :family
nil
+ (list :family
'ipv4 ;; We're not ready for IPv6 yet
:service t
:service t
- :host (or server-host
'local)
+ :host (or server-host
"127.0.0.1") ;; See bug#6781
:plist '(:authenticated nil))
(list :family 'local
:service server-file
:plist '(:authenticated nil))
(list :family 'local
:service server-file
@@
-577,7
+577,7
@@
server or call `M-x server-force-delete' to forcibly disconnect it.")
(loop
;; The auth key is a 64-byte string of random chars in the
;; range `!'..`~'.
(loop
;; The auth key is a 64-byte string of random chars in the
;; range `!'..`~'.
-
for i below
64
+
repeat
64
collect (+ 33 (random 94)) into auth
finally return (concat auth))))
(process-put server-process :auth-key auth-key)
collect (+ 33 (random 94)) into auth
finally return (concat auth))))
(process-put server-process :auth-key auth-key)
@@
-1093,9
+1093,7
@@
The following commands are accepted by the client:
(condition-case err
(let* ((buffers
(when files
(condition-case err
(let* ((buffers
(when files
- (run-hooks 'pre-command-hook)
- (prog1 (server-visit-files files proc nowait)
- (run-hooks 'post-command-hook)))))
+ (server-visit-files files proc nowait))))
(mapc 'funcall (nreverse commands))
(mapc 'funcall (nreverse commands))
@@
-1166,8
+1164,13
@@
so don't mark these buffers specially, just visit them normally."
(obuf (get-file-buffer filen)))
(add-to-history 'file-name-history filen)
(if (null obuf)
(obuf (get-file-buffer filen)))
(add-to-history 'file-name-history filen)
(if (null obuf)
- (set-buffer (find-file-noselect filen))
+ (progn
+ (run-hooks 'pre-command-hook)
+ (set-buffer (find-file-noselect filen)))
(set-buffer obuf)
(set-buffer obuf)
+ ;; separately for each file, in sync with post-command hooks,
+ ;; with the new buffer current:
+ (run-hooks 'pre-command-hook)
(cond ((file-exists-p filen)
(when (not (verify-visited-file-modtime obuf))
(revert-buffer t nil)))
(cond ((file-exists-p filen)
(when (not (verify-visited-file-modtime obuf))
(revert-buffer t nil)))
@@
-1179,7
+1182,9
@@
so don't mark these buffers specially, just visit them normally."
(unless server-buffer-clients
(setq server-existing-buffer t)))
(server-goto-line-column (cdr file))
(unless server-buffer-clients
(setq server-existing-buffer t)))
(server-goto-line-column (cdr file))
- (run-hooks 'server-visit-hook))
+ (run-hooks 'server-visit-hook)
+ ;; hooks may be specific to current buffer:
+ (run-hooks 'post-command-hook))
(unless nowait
;; When the buffer is killed, inform the clients.
(add-hook 'kill-buffer-hook 'server-kill-buffer nil t)
(unless nowait
;; When the buffer is killed, inform the clients.
(add-hook 'kill-buffer-hook 'server-kill-buffer nil t)