(server-log-time-function): Doc fix.

(server-buffer): Fix typo in docstring.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f54b105032daa8667ce8c18e4dfd89f0e7420798..9dbabec7bf9de224f9e621ece300584d8715c4fc 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-27  Juanma Barranquero  <lekktu@gmail.com>
+
+       * server.el (server-log-time-function): Doc fix.
+       (server-buffer): Fix typo in docstring.
+
 2008-01-27  Martin Rudalics  <rudalics@gmx.at>
 
        * view.el (view-buffer): Explain in doc-string why exit-action
@@ -16,11 +21,11 @@
 
 2007-01-27  Jan Nieuwenhuizen  <janneke@gnu.org>
 
-        * add-log.el (change-log-search-file-name, change-log-find-file):
-        New function.
+       * add-log.el (change-log-search-file-name, change-log-find-file):
+       New function.
        (change-log-font-lock-keywords): Move file name matching ...
        (change-log-file-names-re): ... here.  New defconst.
-        (change-log-mode-map): New binding C-c C-f to change-log-find-file.
+       (change-log-mode-map): New binding C-c C-f to change-log-find-file.
 
 2008-01-27  Alan Mackenzie  <acm@muc.de>
 
@@ -41,7 +46,7 @@
 
 2008-01-27  Alan Mackenzie  <acm@muc.de>
 
-       * progmodes/cc-vars.el (c-hanging-braces-alist): new element for
+       * progmodes/cc-vars.el (c-hanging-braces-alist): New element for
        arglist-cont-nonempty.
 
        * progmodes/cc-cmds.el (c-brace-newlines): Determine the newlines

diff --git a/lisp/server.el b/lisp/server.el
index ad4608f2fd2492894f108f344f1cfe7a28c1a2e2..024df5047799a744039e321c43bb374bac57a8df 100644 (file)
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -292,13 +292,13 @@ If NOFRAME is non-nil, let the frames live.  (To be used from
       (server-log "Deleted" proc))))
 
 (defvar server-log-time-function 'current-time-string
-  "Function to generate timestamps for the *server* buffer.")
+  "Function to generate timestamps for `server-buffer'.")
 
 (defconst server-buffer " *server*"
   "Buffer used internally by Emacs's server.
 One use is to log the I/O for debugging purposes (see `server-log'),
 the other is to provide a current buffer in which the process filter can
-safely let-bind buffer-local variables like default-directory.")
+safely let-bind buffer-local variables like `default-directory'.")
 
 (defvar server-log nil
   "If non-nil, log the server's inputs and outputs in the `server-buffer'.")
@@ -952,8 +952,8 @@ The following commands are accepted by the client:
                    ;; Use the same cwd as the emacsclient, if possible, so
                    ;; relative file names work correctly, even in `eval'.
                    (let ((default-directory
-                           (if (and dir (file-directory-p dir))
-                              dir default-directory)))
+                         (if (and dir (file-directory-p dir))
+                             dir default-directory)))
                      (server-execute proc files nowait commands
                                      dontkill frame tty-name))))))