From: Glenn Morris <rgm@gnu.org>
Date: Wed, 27 Oct 2010 06:42:15 +0000 (-0700)
Subject: * server.el (server-host, server-port, server-auth-dir): Autoload risky.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~45^2~443
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7d3e38433d745cbf7e44adcaf3f8da426f42b0b3;p=emacs.git

* server.el (server-host, server-port, server-auth-dir): Autoload risky.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2acf4c69e05..c8a89e272f1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2010-10-27  Glenn Morris  <rgm@gnu.org>
 
+	* server.el (server-host, server-port, server-auth-dir): Autoload risky.
+
 	* term/ns-win.el: Restore require of cl when compiling.
 	(menu-bar-final-items): Remove non-existent `windows' menu.
 
diff --git a/lisp/server.el b/lisp/server.el
index 463b01ccf09..6fbef70768d 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -110,16 +110,18 @@ If set, the server accepts remote connections; otherwise it is local."
           (string :tag "Name or IP address")
           (const :tag "Local" nil))
   :version "22.1")
+;;;###autoload
 (put 'server-host 'risky-local-variable t)
 
 (defcustom server-port nil
   "The port number that the server process should listen on."
   :group 'server
-  :risky t
   :type '(choice
           (string :tag "Port number")
           (const :tag "Random" nil))
   :version "24.1")
+;;;###autoload
+(put 'server-port 'risky-local-variable t)
 
 (defcustom server-auth-dir (locate-user-emacs-file "server/")
   "Directory for server authentication files.
@@ -131,6 +133,7 @@ directory residing in a NTFS partition instead."
   :group 'server
   :type 'directory
   :version "22.1")
+;;;###autoload
 (put 'server-auth-dir 'risky-local-variable t)
 
 (defcustom server-raise-frame t
@@ -1482,5 +1485,4 @@ only these files will be asked to be saved."
 
 (provide 'server)
 
-;; arch-tag: 1f7ecb42-f00a-49f8-906d-61995d84c8d6
 ;;; server.el ends here