diff options
| author | Juanma Barranquero | 2008-01-27 22:47:58 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2008-01-27 22:47:58 +0000 |
| commit | f03ea9d918bf696a78ce34b69914f4457a002816 (patch) | |
| tree | 5252d85e614e2d8235acf85e2cecd566834eb9f8 /lisp | |
| parent | a51b80e7a7dd10a97761ff750deb95310412ff89 (diff) | |
| download | emacs-f03ea9d918bf696a78ce34b69914f4457a002816.tar.gz emacs-f03ea9d918bf696a78ce34b69914f4457a002816.zip | |
(server-log-time-function): Doc fix.
(server-buffer): Fix typo in docstring.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 13 | ||||
| -rw-r--r-- | lisp/server.el | 8 |
2 files changed, 13 insertions, 8 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f54b105032d..9dbabec7bf9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2008-01-27 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * server.el (server-log-time-function): Doc fix. | ||
| 4 | (server-buffer): Fix typo in docstring. | ||
| 5 | |||
| 1 | 2008-01-27 Martin Rudalics <rudalics@gmx.at> | 6 | 2008-01-27 Martin Rudalics <rudalics@gmx.at> |
| 2 | 7 | ||
| 3 | * view.el (view-buffer): Explain in doc-string why exit-action | 8 | * view.el (view-buffer): Explain in doc-string why exit-action |
| @@ -16,11 +21,11 @@ | |||
| 16 | 21 | ||
| 17 | 2007-01-27 Jan Nieuwenhuizen <janneke@gnu.org> | 22 | 2007-01-27 Jan Nieuwenhuizen <janneke@gnu.org> |
| 18 | 23 | ||
| 19 | * add-log.el (change-log-search-file-name, change-log-find-file): | 24 | * add-log.el (change-log-search-file-name, change-log-find-file): |
| 20 | New function. | 25 | New function. |
| 21 | (change-log-font-lock-keywords): Move file name matching ... | 26 | (change-log-font-lock-keywords): Move file name matching ... |
| 22 | (change-log-file-names-re): ... here. New defconst. | 27 | (change-log-file-names-re): ... here. New defconst. |
| 23 | (change-log-mode-map): New binding C-c C-f to change-log-find-file. | 28 | (change-log-mode-map): New binding C-c C-f to change-log-find-file. |
| 24 | 29 | ||
| 25 | 2008-01-27 Alan Mackenzie <acm@muc.de> | 30 | 2008-01-27 Alan Mackenzie <acm@muc.de> |
| 26 | 31 | ||
| @@ -41,7 +46,7 @@ | |||
| 41 | 46 | ||
| 42 | 2008-01-27 Alan Mackenzie <acm@muc.de> | 47 | 2008-01-27 Alan Mackenzie <acm@muc.de> |
| 43 | 48 | ||
| 44 | * progmodes/cc-vars.el (c-hanging-braces-alist): new element for | 49 | * progmodes/cc-vars.el (c-hanging-braces-alist): New element for |
| 45 | arglist-cont-nonempty. | 50 | arglist-cont-nonempty. |
| 46 | 51 | ||
| 47 | * progmodes/cc-cmds.el (c-brace-newlines): Determine the newlines | 52 | * progmodes/cc-cmds.el (c-brace-newlines): Determine the newlines |
diff --git a/lisp/server.el b/lisp/server.el index ad4608f2fd2..024df504779 100644 --- 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 | |||
| 292 | (server-log "Deleted" proc)))) | 292 | (server-log "Deleted" proc)))) |
| 293 | 293 | ||
| 294 | (defvar server-log-time-function 'current-time-string | 294 | (defvar server-log-time-function 'current-time-string |
| 295 | "Function to generate timestamps for the *server* buffer.") | 295 | "Function to generate timestamps for `server-buffer'.") |
| 296 | 296 | ||
| 297 | (defconst server-buffer " *server*" | 297 | (defconst server-buffer " *server*" |
| 298 | "Buffer used internally by Emacs's server. | 298 | "Buffer used internally by Emacs's server. |
| 299 | One use is to log the I/O for debugging purposes (see `server-log'), | 299 | One use is to log the I/O for debugging purposes (see `server-log'), |
| 300 | the other is to provide a current buffer in which the process filter can | 300 | the other is to provide a current buffer in which the process filter can |
| 301 | safely let-bind buffer-local variables like default-directory.") | 301 | safely let-bind buffer-local variables like `default-directory'.") |
| 302 | 302 | ||
| 303 | (defvar server-log nil | 303 | (defvar server-log nil |
| 304 | "If non-nil, log the server's inputs and outputs in the `server-buffer'.") | 304 | "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: | |||
| 952 | ;; Use the same cwd as the emacsclient, if possible, so | 952 | ;; Use the same cwd as the emacsclient, if possible, so |
| 953 | ;; relative file names work correctly, even in `eval'. | 953 | ;; relative file names work correctly, even in `eval'. |
| 954 | (let ((default-directory | 954 | (let ((default-directory |
| 955 | (if (and dir (file-directory-p dir)) | 955 | (if (and dir (file-directory-p dir)) |
| 956 | dir default-directory))) | 956 | dir default-directory))) |
| 957 | (server-execute proc files nowait commands | 957 | (server-execute proc files nowait commands |
| 958 | dontkill frame tty-name)))))) | 958 | dontkill frame tty-name)))))) |
| 959 | 959 | ||