From: Torsten Hilbrich <torsten.hilbrich@gmx.net>
Date: Mon, 14 Dec 2020 08:48:26 +0000 (+0100)
Subject: Use when where else case returns nil
X-Git-Tag: emacs-28.0.90~4726^2~5
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a25a12ddaf;p=emacs.git

Use when where else case returns nil

* lisp/net/dictionary-connection.el (dictionary-connection-status,
dictionary-connection-close): Instead of returning nil in the else case
of the if just use when.

Was suggested by Stefan Kangas.
---

diff --git a/lisp/net/dictionary-connection.el b/lisp/net/dictionary-connection.el
index c762b352b75..0d93d978df3 100644
--- a/lisp/net/dictionary-connection.el
+++ b/lisp/net/dictionary-connection.el
@@ -85,31 +85,29 @@ nil: argument is no connection object
 'up: connection is open and buffer is existing
 'down: connection is closed
 'alone: connection is not associated with a buffer"
-  (if (dictionary-connection-p connection)
-      (let ((process (dictionary-connection-process connection))
-	    (buffer (dictionary-connection-buffer connection)))
-	(if (not process)
-	    'none
-	  (if (not (buffer-live-p buffer))
-	      'alone
-	    (if (not (eq (process-status process) 'open))
-		'down
-	      'up))))
-    nil))
+  (when (dictionary-connection-p connection)
+    (let ((process (dictionary-connection-process connection))
+          (buffer (dictionary-connection-buffer connection)))
+      (if (not process)
+          'none
+        (if (not (buffer-live-p buffer))
+            'alone
+          (if (not (eq (process-status process) 'open))
+              'down
+            'up))))))
 
 (defun dictionary-connection-close (connection)
   "Force closing of the connection."
-  (if (dictionary-connection-p connection)
-      (progn
-	(let ((buffer (dictionary-connection-buffer connection))
-	      (process (dictionary-connection-process connection)))
-	  (if process
-	      (delete-process process))
-	  (if buffer
-	      (kill-buffer buffer))
-
-	  (dictionary-connection-set-process connection nil)
-	  (dictionary-connection-set-buffer connection nil)))))
+  (when (dictionary-connection-p connection)
+    (let ((buffer (dictionary-connection-buffer connection))
+          (process (dictionary-connection-process connection)))
+      (if process
+          (delete-process process))
+      (if buffer
+          (kill-buffer buffer))
+
+      (dictionary-connection-set-process connection nil)
+      (dictionary-connection-set-buffer connection nil))))
 
 (defun dictionary-connection-send (connection data)
   "Send `data' to the process."