gnucash maint: Multiple changes pushed
Frank H.Ellenberger
fell at code.gnucash.org
Mon Nov 25 01:22:26 EST 2019
Updated via https://github.com/Gnucash/gnucash/commit/a261c8aa (commit)
via https://github.com/Gnucash/gnucash/commit/91183a2a (commit)
from https://github.com/Gnucash/gnucash/commit/e83f5b05 (commit)
commit a261c8aadb7904f6a7e0143290d2d82e87a09d86
Merge: e83f5b056 91183a2af
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Mon Nov 25 07:14:05 2019 +0100
Merge branch 'emacs' into maint
commit 91183a2af51858b6a252edc47372c944c0cd82b7
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Mon Nov 25 00:42:40 2019 +0100
drop emacs_trailer from xml files.
Modern versions of emacs know, how to behave on xml files.
diff --git a/libgnucash/backend/xml/io-example-account.cpp b/libgnucash/backend/xml/io-example-account.cpp
index 80572b053..918217ee4 100644
--- a/libgnucash/backend/xml/io-example-account.cpp
+++ b/libgnucash/backend/xml/io-example-account.cpp
@@ -425,8 +425,6 @@ gnc_write_example_account (GncExampleAccount* gea, const gchar* filename)
fprintf (out, "</" GNC_ACCOUNT_STRING ">\n\n");
- write_emacs_trailer (out);
-
fclose (out);
return TRUE;
diff --git a/libgnucash/backend/xml/io-gncxml-v2.cpp b/libgnucash/backend/xml/io-gncxml-v2.cpp
index 085119e35..7f7fc900f 100644
--- a/libgnucash/backend/xml/io-gncxml-v2.cpp
+++ b/libgnucash/backend/xml/io-gncxml-v2.cpp
@@ -1601,8 +1601,7 @@ gnc_book_write_to_xml_file_v2 (
/* Try to write as much as possible */
if (!out
- || !gnc_book_write_to_xml_filehandle_v2 (book, out)
- || !write_emacs_trailer (out))
+ || !gnc_book_write_to_xml_filehandle_v2 (book, out))
success = FALSE;
/* Close the output stream */
@@ -1633,8 +1632,7 @@ gnc_book_write_accounts_to_xml_file_v2 (QofBackend* qof_be, QofBook* book,
/* Try to write as much as possible */
if (!out
- || !gnc_book_write_accounts_to_xml_filehandle_v2 (qof_be, book, out)
- || !write_emacs_trailer (out))
+ || !gnc_book_write_accounts_to_xml_filehandle_v2 (qof_be, book, out))
success = FALSE;
/* Close the output stream */
@@ -2153,7 +2151,7 @@ gnc_xml2_parse_with_subst (GncXmlBackend* xml_be, QofBook* book, GHashTable* sub
xml_be, book, (sixtp_push_handler) parse_with_subst_push_handler,
push_data, GNC_BOOK_XML2_FILE);
g_free (push_data);
-
+
if (success)
qof_instance_set_dirty (QOF_INSTANCE (book));
diff --git a/libgnucash/backend/xml/io-utils.cpp b/libgnucash/backend/xml/io-utils.cpp
index c2d033e38..8d9cbfe44 100644
--- a/libgnucash/backend/xml/io-utils.cpp
+++ b/libgnucash/backend/xml/io-utils.cpp
@@ -33,23 +33,6 @@ extern "C"
#include "gnc-xml.h"
#include "io-utils.h"
#include "sixtp.h"
-/*
- <!-- Local variables: -->
- <!-- mode: C -->
- <!-- End: -->
-*/
-
-static const gchar* emacs_trailer =
- "<!-- Local variables: -->\n"
- "<!-- mode: xml -->\n"
- "<!-- End: -->\n";
-
-
-gboolean
-write_emacs_trailer (FILE* out)
-{
- return fprintf (out, "%s", emacs_trailer) >= 0;
-}
static gboolean
write_one_account (FILE* out,
@@ -66,7 +49,7 @@ write_one_account (FILE* out,
xmlFreeNode (accnode);
g_return_val_if_fail(gd, FALSE);
-
+
if (ferror (out) || fprintf (out, "\n") < 0)
return FALSE;
diff --git a/libgnucash/backend/xml/io-utils.h b/libgnucash/backend/xml/io-utils.h
index 9c78470a7..c6a4ba442 100644
--- a/libgnucash/backend/xml/io-utils.h
+++ b/libgnucash/backend/xml/io-utils.h
@@ -37,7 +37,5 @@ gboolean write_accounts (FILE* out, QofBook* book, sixtp_gdv2* gd);
gboolean write_book_parts (FILE* out, QofBook* book);
gboolean write_commodities (FILE* out, QofBook* book, sixtp_gdv2* gd);
-gboolean write_emacs_trailer (FILE* out);
-
#endif /* IO_UTILS_H */
Summary of changes:
libgnucash/backend/xml/io-example-account.cpp | 2 --
libgnucash/backend/xml/io-gncxml-v2.cpp | 8 +++-----
libgnucash/backend/xml/io-utils.cpp | 19 +------------------
libgnucash/backend/xml/io-utils.h | 2 --
4 files changed, 4 insertions(+), 27 deletions(-)
More information about the gnucash-changes
mailing list