From: Peter Münster <pm@a16n.net>
Date: Tue, 17 Aug 2021 23:37:43 +0000 (+0200)
Subject: New placement of newline characters in image-dired-db-file
X-Git-Tag: emacs-28.0.90~1435
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=101b3c81b657198ebaf9abdaa0875d1b09d66192;p=emacs.git

New placement of newline characters in image-dired-db-file

It's more usual to have the newline at the end of the line, instead of the
beginning. This change avoids missing newline at the end of the file, an
empty line at the start and eventually a lot of empty lines when
`require-final-newline' is not nil.

* lisp/image-dired.el (image-dired-write-tags): Insert newline at the end
of the line, instead of the beginning.
(image-dired-remove-tag): Do not delete empty line at end of buffer.
---

diff --git a/lisp/image-dired.el b/lisp/image-dired.el
index 9455ab1ff08..542701470e9 100644
--- a/lisp/image-dired.el
+++ b/lisp/image-dired.el
@@ -1096,7 +1096,7 @@ FILE-TAGS is an alist in the following form:
 	       (end-of-line)
 	       (insert (format ";%s" tag))))
 	 (goto-char (point-max))
-	 (insert (format "\n%s;%s" file tag))))
+	 (insert (format "%s;%s\n" file tag))))
      (save-buffer))))
 
 (defun image-dired-remove-tag (files tag)
@@ -1123,11 +1123,7 @@ FILE-TAGS is an alist in the following form:
 	   (setq end (point))
 	   (beginning-of-line)
 	   (when (not (search-forward ";" end t))
-	     (kill-line 1)
-	     ;; If on empty line at end of buffer
-	     (and (eobp)
-		  (looking-at "^$")
-		  (delete-char -1)))))))
+	     (kill-line 1))))))
    (save-buffer)))
 
 (defun image-dired-list-tags (file)
@@ -2185,7 +2181,7 @@ FILE-COMMENTS is an alist on the following form:
 	     (insert (format "comment:%s;" comment)))
 	 ;; File does not exist in database - add it.
 	 (goto-char (point-max))
-	 (insert (format "\n%s;comment:%s" file comment))))
+	 (insert (format "%s;comment:%s\n" file comment))))
      (save-buffer))))
 
 (defun image-dired-update-property (prop value)