From: Benno Schulenberg <bensberg@justemail.net>
Date: Wed, 20 Jan 2016 15:33:41 +0000 (+0000)
Subject: Readjusting the indentation and a comment.
X-Git-Tag: v2.5.2~62
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=a91a1c7bbd3b3b6b881b6cddfc54f0f82d9de7a9;p=nano.git

Readjusting the indentation and a comment.


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5573 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
---

diff --git a/ChangeLog b/ChangeLog
index 81f4f566..b4b6bba2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2016-01-20  Benno Schulenberg  <bensberg@justemail.net>
+	* src/files.c (open_buffer): Readjust the indentation and a comment.
+
 2016-01-20  Rishabh Dave  <rishabhddave@gmail.com>
 	* src/files.c (verify_path, open_buffer): When opening a new buffer,
 	verify that the containing directory of the given filename exists.
diff --git a/src/files.c b/src/files.c
index 310c3000..8a7a0812 100644
--- a/src/files.c
+++ b/src/files.c
@@ -400,29 +400,28 @@ bool open_buffer(const char *filename, bool undoable)
     }
 
     /* If we're going to load into a new buffer, first create the new
-     * buffer and lock the corresponding file. */
+     * buffer and (if possible) lock the corresponding file. */
     if (new_buffer) {
 	make_new_buffer();
 
 	verify_path(filename);
 
-	if (valid_path) {
 #ifndef NANO_TINY
-	if (ISSET(LOCKING) && filename[0] != '\0') {
-	    int lockstatus = do_lockfile(filename);
-	    if (lockstatus < 0) {
+	if (valid_path) {
+	    if (ISSET(LOCKING) && filename[0] != '\0') {
+		int lockstatus = do_lockfile(filename);
+		if (lockstatus < 0) {
 #ifndef DISABLE_MULTIBUFFER
-		if (openfile->next) {
-		    close_buffer(TRUE);
-		    return FALSE;
-		}
+		    if (openfile->next) {
+			close_buffer(TRUE);
+			return FALSE;
+		    }
 #endif
-	    } else if (lockstatus == 0) {
-		quiet = TRUE;
+		} else if (lockstatus == 0)
+		    quiet = TRUE;
 	    }
 	}
-#endif
-	}
+#endif /* !NANO_TINY */
     }
 
     /* If the filename isn't blank, and we are not in NOREAD_MODE,