aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/server.el
diff options
context:
space:
mode:
authorKim F. Storm2005-02-09 15:50:47 +0000
committerKim F. Storm2005-02-09 15:50:47 +0000
commitbf247b6ed0b5e96845e785302bdaa97fcf6a8b84 (patch)
tree3e5225520dfe10e9394f68088de2fe22027aa53f /lisp/server.el
parent1de0ae85b33c8d8cb77ab839f66d2df4f9aa7b94 (diff)
downloademacs-bf247b6ed0b5e96845e785302bdaa97fcf6a8b84.tar.gz
emacs-bf247b6ed0b5e96845e785302bdaa97fcf6a8b84.zip
Change release version from 21.4 to 22.1 throughout.
Change development version from 21.3.50 to 22.0.50.
Diffstat (limited to 'lisp/server.el')
-rw-r--r--lisp/server.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/server.el b/lisp/server.el
index 2c946b90275..a0f41e59ff8 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -123,7 +123,7 @@ If it is a frame, use the frame's selected window.
123It is not meaningful to set this to a specific frame or window with Custom. 123It is not meaningful to set this to a specific frame or window with Custom.
124Only programs can do so." 124Only programs can do so."
125 :group 'server 125 :group 'server
126 :version "21.4" 126 :version "22.1"
127 :type '(choice (const :tag "Use selected window" 127 :type '(choice (const :tag "Use selected window"
128 :match (lambda (widget value) 128 :match (lambda (widget value)
129 (not (functionp value))) 129 (not (functionp value)))
@@ -282,7 +282,7 @@ Server mode runs a process that accepts commands from the
282`emacsclient' program. See `server-start' and Info node `Emacs server'." 282`emacsclient' program. See `server-start' and Info node `Emacs server'."
283 :global t 283 :global t
284 :group 'server 284 :group 'server
285 :version "21.4" 285 :version "22.1"
286 ;; Fixme: Should this check for an existing server socket and do 286 ;; Fixme: Should this check for an existing server socket and do
287 ;; nothing if there is one (for multiple Emacs sessions)? 287 ;; nothing if there is one (for multiple Emacs sessions)?
288 (server-start (not server-mode))) 288 (server-start (not server-mode)))