lisp/server.el (server-eval-and-print): Return any result, even nil.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0dc4ca5e4ec23e082ec30a681e955bfc99f3ead8..5e74c9604fd1eafc8396203a376ac36c9ad38501 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2011-07-04  Juanma Barranquero  <lekktu@gmail.com>
+
+       * server.el (server-eval-and-print): Return any result, even nil.
+
 2011-07-03  Paul Eggert  <eggert@cs.ucla.edu>
 
        * type-break.el: Accept time formats that the builtins accept.
@@ -42,7 +46,7 @@
        * isearch.el (isearch-search-fun-function): Clarify the doc string
        (bug#8101).
 
-2011-07-03  Richard Kim <emacs18@gmail.com> (tiny change)
+2011-07-03  Richard Kim  <emacs18@gmail.com>  (tiny change)
 
        * textmodes/texnfo-upd.el (texinfo-insert-menu): Don't insert
        unnecessary spaces (bug#8987).
@@ -508,7 +512,7 @@
        (ses-cell-symbol): Set macro as safe, so that it can be used in
        formulas.
 
-       * ses.el:  Update cycle detection algorithm.
+       * ses.el: Update cycle detection algorithm.
        (ses-localvars): Add ses--Dijkstra-attempt-nb and
        ses--Dijkstra-weight-bound, and initial values thereof when applicable.
        (ses-set-localvars): New function.

diff --git a/lisp/server.el b/lisp/server.el
index 42da7a210c55f78fe68f7b00feb93bd43673111e..36b137b7bc999bf2bbafabd39b8f16fc6546e98a 100644 (file)
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -679,7 +679,7 @@ Server mode runs a process that accepts commands from the
 (defun server-eval-and-print (expr proc)
   "Eval EXPR and send the result back to client PROC."
   (let ((v (eval (car (read-from-string expr)))))
-    (when (and v proc)
+    (when proc
       (with-temp-buffer
         (let ((standard-output (current-buffer)))
           (pp v)
@@ -1200,12 +1200,12 @@ so don't mark these buffers specially, just visit them normally."
          (add-to-history 'file-name-history filen)
          (if (null obuf)
              (progn
-               (run-hooks 'pre-command-hook)  
+               (run-hooks 'pre-command-hook)
                (set-buffer (find-file-noselect filen)))
             (set-buffer obuf)
            ;; separately for each file, in sync with post-command hooks,
            ;; with the new buffer current:
-           (run-hooks 'pre-command-hook)  
+           (run-hooks 'pre-command-hook)
             (cond ((file-exists-p filen)
                    (when (not (verify-visited-file-modtime obuf))
                      (revert-buffer t nil)))
@@ -1219,7 +1219,7 @@ so don't mark these buffers specially, just visit them normally."
           (server-goto-line-column (cdr file))
           (run-hooks 'server-visit-hook)
          ;; hooks may be specific to current buffer:
-         (run-hooks 'post-command-hook)) 
+         (run-hooks 'post-command-hook))
        (unless nowait
          ;; When the buffer is killed, inform the clients.
          (add-hook 'kill-buffer-hook 'server-kill-buffer nil t)