aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2010-10-26 23:42:15 -0700
committerGlenn Morris2010-10-26 23:42:15 -0700
commit7d3e38433d745cbf7e44adcaf3f8da426f42b0b3 (patch)
treed045a2f8d3809a80fdecb1b08f708fb01dcafd87
parent3444dc6164e49874d253fb921df31f45f4554090 (diff)
downloademacs-7d3e38433d745cbf7e44adcaf3f8da426f42b0b3.tar.gz
emacs-7d3e38433d745cbf7e44adcaf3f8da426f42b0b3.zip
* server.el (server-host, server-port, server-auth-dir): Autoload risky.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/server.el6
2 files changed, 6 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2acf4c69e05..c8a89e272f1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12010-10-27 Glenn Morris <rgm@gnu.org> 12010-10-27 Glenn Morris <rgm@gnu.org>
2 2
3 * server.el (server-host, server-port, server-auth-dir): Autoload risky.
4
3 * term/ns-win.el: Restore require of cl when compiling. 5 * term/ns-win.el: Restore require of cl when compiling.
4 (menu-bar-final-items): Remove non-existent `windows' menu. 6 (menu-bar-final-items): Remove non-existent `windows' menu.
5 7
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."
110 (string :tag "Name or IP address") 110 (string :tag "Name or IP address")
111 (const :tag "Local" nil)) 111 (const :tag "Local" nil))
112 :version "22.1") 112 :version "22.1")
113;;;###autoload
113(put 'server-host 'risky-local-variable t) 114(put 'server-host 'risky-local-variable t)
114 115
115(defcustom server-port nil 116(defcustom server-port nil
116 "The port number that the server process should listen on." 117 "The port number that the server process should listen on."
117 :group 'server 118 :group 'server
118 :risky t
119 :type '(choice 119 :type '(choice
120 (string :tag "Port number") 120 (string :tag "Port number")
121 (const :tag "Random" nil)) 121 (const :tag "Random" nil))
122 :version "24.1") 122 :version "24.1")
123;;;###autoload
124(put 'server-port 'risky-local-variable t)
123 125
124(defcustom server-auth-dir (locate-user-emacs-file "server/") 126(defcustom server-auth-dir (locate-user-emacs-file "server/")
125 "Directory for server authentication files. 127 "Directory for server authentication files.
@@ -131,6 +133,7 @@ directory residing in a NTFS partition instead."
131 :group 'server 133 :group 'server
132 :type 'directory 134 :type 'directory
133 :version "22.1") 135 :version "22.1")
136;;;###autoload
134(put 'server-auth-dir 'risky-local-variable t) 137(put 'server-auth-dir 'risky-local-variable t)
135 138
136(defcustom server-raise-frame t 139(defcustom server-raise-frame t
@@ -1482,5 +1485,4 @@ only these files will be asked to be saved."
1482 1485
1483(provide 'server) 1486(provide 'server)
1484 1487
1485;; arch-tag: 1f7ecb42-f00a-49f8-906d-61995d84c8d6
1486;;; server.el ends here 1488;;; server.el ends here