From ecd7088439d2158538f38f61b3260acca80f54ac Mon Sep 17 00:00:00 2001 From: Jacob Hrbek Date: Tue, 1 Sep 2020 22:16:00 +0200 Subject: [PATCH] elisp: more fixes --- src/RXT0112-1/downstream-classes/zeres-0/elisp/UNLEASH.el | 3 --- .../downstream-classes/zeres-0/elisp/output/edebug.el | 6 +++--- .../downstream-classes/zeres-0/elisp/output/eerror.el | 6 +++--- .../downstream-classes/zeres-0/elisp/output/efixme.el | 6 +++--- .../downstream-classes/zeres-0/elisp/output/einfo.el | 6 +++--- .../downstream-classes/zeres-0/elisp/output/ewarn.el | 6 +++--- 6 files changed, 15 insertions(+), 18 deletions(-) diff --git a/src/RXT0112-1/downstream-classes/zeres-0/elisp/UNLEASH.el b/src/RXT0112-1/downstream-classes/zeres-0/elisp/UNLEASH.el index 010be09..108b09b 100755 --- a/src/RXT0112-1/downstream-classes/zeres-0/elisp/UNLEASH.el +++ b/src/RXT0112-1/downstream-classes/zeres-0/elisp/UNLEASH.el @@ -15,7 +15,6 @@ ;; Source variables (load "/home/kreyren/Repositories/Zernit/src/RXT0112-1/downstream-classes/zeres-0/elisp/variables/emacs-debug.el") (load "/home/kreyren/Repositories/Zernit/src/RXT0112-1/downstream-classes/zeres-0/elisp/variables/emacs-log-file.el") -;;(setq emacs-log-file "/home/kreyren/emacs.log") ;; Source functions (load "/home/kreyren/Repositories/Zernit/src/RXT0112-1/downstream-classes/zeres-0/elisp/output/die.el") @@ -24,5 +23,3 @@ (load "/home/kreyren/Repositories/Zernit/src/RXT0112-1/downstream-classes/zeres-0/elisp/output/efixme.el") (load "/home/kreyren/Repositories/Zernit/src/RXT0112-1/downstream-classes/zeres-0/elisp/output/edebug.el") (load "/home/kreyren/Repositories/Zernit/src/RXT0112-1/downstream-classes/zeres-0/elisp/output/eerror.el") - -(die "true") diff --git a/src/RXT0112-1/downstream-classes/zeres-0/elisp/output/edebug.el b/src/RXT0112-1/downstream-classes/zeres-0/elisp/output/edebug.el index 01a7d60..396b5bc 100644 --- a/src/RXT0112-1/downstream-classes/zeres-0/elisp/output/edebug.el +++ b/src/RXT0112-1/downstream-classes/zeres-0/elisp/output/edebug.el @@ -9,12 +9,12 @@ "Non-standard function used to output in the buffer with logging support to annoy the end-user with fixme messages for code quality issues that might influence the runtime" (cond - ((or (= (length message) 0) (boundp 'message)) - (princ (format die-format-string-bug (format "Function '%1$s' was used without specified message '%2$s'" function-name message))) - (append-to-file (format die-format-string-bug (format "Function '%1$s' was used without specified message '%2$s'" function-name message)) nil emacs-log-file) ) ((> (length message) 0) (princ (format edebug-format-string message) (append-to-file (format edebug-format-string message) nil emacs-log-file)) ) + ((or (= (length message) 0) (boundp 'message)) + (princ (format die-format-string-bug (format "Function '%1$s' was used without specified message '%2$s'" function-name message))) + (append-to-file (format die-format-string-bug (format "Function '%1$s' was used without specified message '%2$s'" function-name message)) nil emacs-log-file) ) (t (princ (format die-format-string-unexpected (format "Function '%1$s' with argument 'message' storing value '%2$s' triggered an unexpected trap which usually indicates insufficient programming logic" function-name message))) (append-to-file (format die-format-string-unexpected (format "Function '%1$s' with argument 'message' storing value '%2$s' triggered an unexpected trap which usually indicates insufficient programming logic" function-name message)) nil emacs-log-file) diff --git a/src/RXT0112-1/downstream-classes/zeres-0/elisp/output/eerror.el b/src/RXT0112-1/downstream-classes/zeres-0/elisp/output/eerror.el index f85e197..f863f67 100644 --- a/src/RXT0112-1/downstream-classes/zeres-0/elisp/output/eerror.el +++ b/src/RXT0112-1/downstream-classes/zeres-0/elisp/output/eerror.el @@ -8,12 +8,12 @@ "Non-standard function used to output in the buffer with logging support to inform the end-user about non-fatal errors" (cond - ((or (= (length message) 0) (boundp 'message)) - (princ (format die-format-string-bug (format "Function '%1$s' was used without specified message '%2$s'" function-name message))) - (append-to-file (format die-format-string-bug (format "Function '%1$s' was used without specified message '%2$s'" function-name message)) nil emacs-log-file) ) ((> (length message) 0) (princ (format eerror-format-string message)) (append-to-file (format eerror-format-string message) nil emacs-log-file)) + ((or (= (length message) 0) (boundp 'message)) + (princ (format die-format-string-bug (format "Function '%1$s' was used without specified message '%2$s'" function-name message))) + (append-to-file (format die-format-string-bug (format "Function '%1$s' was used without specified message '%2$s'" function-name message)) nil emacs-log-file) ) (t (princ (format die-format-string-unexpected (format "Function '%1$s' with argument 'message' storing value '%2$s' triggered an unexpected trap which usually indicates insufficient programming logic" function-name message))) (append-to-file (format die-format-string-unexpected (format "Function '%1$s' with argument 'message' storing value '%2$s' triggered an unexpected trap which usually indicates insufficient programming logic" function-name message)) nil emacs-log-file) diff --git a/src/RXT0112-1/downstream-classes/zeres-0/elisp/output/efixme.el b/src/RXT0112-1/downstream-classes/zeres-0/elisp/output/efixme.el index 0c80ab3..b36c5f1 100644 --- a/src/RXT0112-1/downstream-classes/zeres-0/elisp/output/efixme.el +++ b/src/RXT0112-1/downstream-classes/zeres-0/elisp/output/efixme.el @@ -9,12 +9,12 @@ "Non-standard function used to output in the buffer with logging support to annoy the end-user with fixme messages for code quality issues that might influence the runtime" (cond - ((or (= (length message) 0) (boundp 'message)) - (princ (format die-format-string-bug (format "Function '%1$s' was used without specified message '%2$s'" function-name message)) - (append-to-file (format die-format-string-bug (format "Function '%1$s' was used without specified message '%2$s'" function-name message)) nil emacs-log-file)) ) ((> (length message) 0) (princ (format efixme-format-string message) (append-to-file (format efixme-format-string message) nil emacs-log-file)) ) + ((or (= (length message) 0) (boundp 'message)) + (princ (format die-format-string-bug (format "Function '%1$s' was used without specified message '%2$s'" function-name message)) + (append-to-file (format die-format-string-bug (format "Function '%1$s' was used without specified message '%2$s'" function-name message)) nil emacs-log-file)) ) (t (princ (format die-format-string-unexpected (format "Function '%1$s' with argument 'message' storing value '%2$s' triggered an unexpected trap which usually indicates insufficient programming logic" function-name message))) (append-to-file (format die-format-string-unexpected (format "Function '%1$s' with argument 'message' storing value '%2$s' triggered an unexpected trap which usually indicates insufficient programming logic" function-name message)) nil emacs-log-file) diff --git a/src/RXT0112-1/downstream-classes/zeres-0/elisp/output/einfo.el b/src/RXT0112-1/downstream-classes/zeres-0/elisp/output/einfo.el index e4574e9..74b05f1 100644 --- a/src/RXT0112-1/downstream-classes/zeres-0/elisp/output/einfo.el +++ b/src/RXT0112-1/downstream-classes/zeres-0/elisp/output/einfo.el @@ -8,12 +8,12 @@ "Non-standard function used to output in the buffer with logging support to inform the end-user about runtime events" (cond - ((or (= (length message) 0) (boundp 'message)) - (princ (format die-format-string-bug (format "Function '%1$s' was used without specified message '%2$s'" function-name message))) - (append-to-file (format die-format-string-bug (format "Function '%1$s' was used without specified message '%2$s'" function-name message)) nil emacs-log-file) ) ((> (length message) 0) (princ (format einfo-format-string message) (append-to-file (format einfo-format-string message) nil emacs-log-file)) ) + ((or (= (length message) 0) (boundp 'message)) + (princ (format die-format-string-bug (format "Function '%1$s' was used without specified message '%2$s'" function-name message))) + (append-to-file (format die-format-string-bug (format "Function '%1$s' was used without specified message '%2$s'" function-name message)) nil emacs-log-file) ) (t (princ (format die-format-string-unexpected (format "Function '%1$s' with argument 'message' storing value '%2$s' triggered an unexpected trap which usually indicates insufficient programming logic" function-name message))) (append-to-file (format die-format-string-unexpected (format "Function '%1$s' with argument 'message' storing value '%2$s' triggered an unexpected trap which usually indicates insufficient programming logic" function-name message)) nil emacs-log-file) diff --git a/src/RXT0112-1/downstream-classes/zeres-0/elisp/output/ewarn.el b/src/RXT0112-1/downstream-classes/zeres-0/elisp/output/ewarn.el index ac0a062..1d97681 100644 --- a/src/RXT0112-1/downstream-classes/zeres-0/elisp/output/ewarn.el +++ b/src/RXT0112-1/downstream-classes/zeres-0/elisp/output/ewarn.el @@ -8,12 +8,12 @@ "Non-standard function used to output in the buffer with logging support to warn the end-user about potential issues" (cond - ((or (= (length message) 0) (boundp 'message)) - (princ (format die-format-string-bug (format "Function '%1$s' was used without specified message '%2$s'" function-name message)) - (append-to-file (format die-format-string-bug (format "Function '%1$s' was used without specified message '%2$s'" function-name message)) nil emacs-log-file) ) ((> (length message) 0) (princ (format ewarn-format-string message)) (append-to-file (format ewarn-format-string message) nil emacs-log-file) ) + ((or (= (length message) 0) (boundp 'message)) + (princ (format die-format-string-bug (format "Function '%1$s' was used without specified message '%2$s'" function-name message)) + (append-to-file (format die-format-string-bug (format "Function '%1$s' was used without specified message '%2$s'" function-name message)) nil emacs-log-file) ) (t (princ (format die-format-string-unexpected (format "Function '%1$s' with argument 'message' storing value '%2$s' triggered an unexpected trap which usually indicates insufficient programming logic" function-name message)) (append-to-file (format die-format-string-unexpected (format "Function '%1$s' with argument 'message' storing value '%2$s' triggered an unexpected trap which usually indicates insufficient programming logic" function-name message)) nil emacs-log-file))) )