1 files changed, 1 insertions, 0 deletions

diff --git a/lisp/server.el b/lisp/server.el
index 064a3165a0b..9273064a7c5 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -95,6 +95,7 @@ which are deleted and reused after each edit
 by the programs that invoke the emacs server.")
 
 (make-variable-buffer-local 'server-buffer-clients)
+(put 'server-buffer-clients 'permanent-local t)
 (setq-default server-buffer-clients nil)
 (or (assq 'server-buffer-clients minor-mode-alist)
     (setq minor-mode-alist (cons '(server-buffer-clients " Server") minor-mode-alist)))