[Emacs-diffs] /srv/bzr/emacs/trunk r104925: lisp/server.el (server-eval-and-print): Return any result, even nil.

[Juanma Barranquero]

------------------------------------------------------------
revno: 104925
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Mon 2011-07-04 03:04:29 +0200
message:
  lisp/server.el (server-eval-and-print): Return any result, even nil.
modified:
  lisp/ChangeLog
  lisp/server.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-07-03 23:51:42 +0000
+++ b/lisp/ChangeLog    2011-07-04 01:04:29 +0000
@@ -1,3 +1,7 @@
+2011-07-04  Juanma Barranquero  <address@hidden>
+
+       * server.el (server-eval-and-print): Return any result, even nil.
+
 2011-07-03  Paul Eggert  <address@hidden>
 
        * 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 <address@hidden> (tiny change)
+2011-07-03  Richard Kim  <address@hidden>  (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.

=== modified file 'lisp/server.el'
--- a/lisp/server.el    2011-06-25 18:05:48 +0000
+++ b/lisp/server.el    2011-07-04 01:04:29 +0000
@@ -679,7 +679,7 @@
 (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 @@
          (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 @@
           (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)