[gentoo-commits] proj/emacs-tools:ebuild-mode commit in: /

["Ulrich Müller" <ulm@gentoo.org>]

commit:     6d7464806738628ad29b18daa796366e462897f3
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 27 21:58:07 2017 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Feb 27 21:58:07 2017 +0000
URL:        https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=6d746480

Make fixing of whitespace before saving conditional.

* ebuild-mode.el (ebuild-mode): New customisation group.
(ebuild-mode-portdir): Change to custom variable.
(ebuild-mode-fix-whitespace): New custom variable, defaults to t.
(ebuild-mode-before-save): Make fixing of whitespace conditional.

 ChangeLog      |  5 +++++
 ebuild-mode.el | 26 ++++++++++++++++++++------
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fe1ced8..285118d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2017-02-27  Ulrich Müller  <ulm@gentoo.org>
 
+	* ebuild-mode.el (ebuild-mode): New customisation group.
+	(ebuild-mode-portdir): Change to custom variable.
+	(ebuild-mode-fix-whitespace): New custom variable, defaults to t.
+	(ebuild-mode-before-save): Make fixing of whitespace conditional.
+
 	* ebuild-mode.el:
 	* ebuild-mode.texi: Update documentation to use generic terms
 	where possible, instead of being Portage specific.

diff --git a/ebuild-mode.el b/ebuild-mode.el
index 3f3e0fe..85491f8 100644
--- a/ebuild-mode.el
+++ b/ebuild-mode.el
@@ -59,6 +59,23 @@ A formfeed is not considered whitespace by this function."
 
 ;;; Variables.
 
+(defgroup ebuild-mode nil
+  "Ebuild mode."
+  :group 'languages)
+
+(defcustom ebuild-mode-portdir
+  "/usr/portage"
+  "Location of the ebuild repository."
+  :type 'string
+  :group 'ebuild-mode)
+
+(defcustom ebuild-mode-fix-whitespace t
+  "If non-nil, fix whitespace before writing a file.
+Namely, delete trailing whitespace and tabify whitespace at beginning
+of lines."
+  :type 'boolean
+  :group 'ebuild-mode)
+
 ;; Predicate function for comparison of architecture keywords
 ;; (needed for variable definitions below)
 (defun ebuild-mode-arch-lessp (a b)
@@ -71,10 +88,6 @@ A formfeed is not considered whitespace by this function."
 	(string-lessp (car as) (car bs))
       (string-lessp (cadr as) (cadr bs)))))
 
-(defvar ebuild-mode-portdir
-  "/usr/portage"
-  "Location of the ebuild repository.")
-
 (defvar ebuild-mode-arch-list
   (or
    (condition-case nil
@@ -220,8 +233,9 @@ Optional argument LIMIT restarts collection after that number of elements."
 	    (indent-to end-col)))))))
 
 (defun ebuild-mode-before-save ()
-  (delete-trailing-whitespace)
-  (ebuild-mode-tabify)
+  (when ebuild-mode-fix-whitespace
+    (delete-trailing-whitespace)
+    (ebuild-mode-tabify))
   ;;(copyright-update)			; doesn't exist in XEmacs
   ;; return nil, otherwise the file is presumed to be written
   nil)