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

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

commit:     24a7808a9283f509980a57c1f94de28ad02ae266
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 28 19:19:02 2017 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Feb 28 19:19:02 2017 +0000
URL:        https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=24a7808a

Update ebuild header, when customised to do so.

* ebuild-mode.el (ebuild-mode-update-copyright)
(ebuild-mode-delete-cvs-line): New custom variables, default to t.
(ebuild-mode-copyright-regexp, ebuild-mode-cvs-header-regexp):
New variables.
(ebuild-mode-update-copyright, ebuild-mode-delete-cvs-line):
New functions.
(ebuild-mode-before-save): Update copyright years and remove CVS
Id or Header line, when customised to do so, respectively.

 ChangeLog      | 11 +++++++++++
 ebuild-mode.el | 46 +++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 285118d..4d8c0dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2017-02-28  Ulrich Müller  <ulm@gentoo.org>
+
+	* ebuild-mode.el (ebuild-mode-update-copyright)
+	(ebuild-mode-delete-cvs-line): New custom variables, default to t.
+	(ebuild-mode-copyright-regexp, ebuild-mode-cvs-header-regexp):
+	New variables.
+	(ebuild-mode-update-copyright, ebuild-mode-delete-cvs-line):
+	New functions.
+	(ebuild-mode-before-save): Update copyright years and remove CVS
+	Id or Header line, when customised to do so, respectively.
+
 2017-02-27  Ulrich Müller  <ulm@gentoo.org>
 
 	* ebuild-mode.el (ebuild-mode): New customisation group.

diff --git a/ebuild-mode.el b/ebuild-mode.el
index 85491f8..f2c88df 100644
--- a/ebuild-mode.el
+++ b/ebuild-mode.el
@@ -76,6 +76,16 @@ of lines."
   :type 'boolean
   :group 'ebuild-mode)
 
+(defcustom ebuild-mode-update-copyright t
+  "If non-nil, update copyright years before writing a file."
+  :type 'boolean
+  :group 'ebuild-mode)
+
+(defcustom ebuild-mode-delete-cvs-line t
+  "If non-nil, delete any CVS $Id$ or $Header$ line before writing a file."
+  :type 'boolean
+  :group 'ebuild-mode)
+
 ;; Predicate function for comparison of architecture keywords
 ;; (needed for variable definitions below)
 (defun ebuild-mode-arch-lessp (a b)
@@ -125,6 +135,12 @@ of lines."
 (defvar ebuild-mode-arch-regexp
   "^[ \t]*KEYWORDS=[\"']\\([^\"]*\\)[\"'][ \t]*$")
 
+(defvar ebuild-mode-copyright-regexp
+  "^#[ \t]*Copyright[ \t]+\\([1-9][0-9]+\\)-\\([1-9][0-9]+\\)[ \t]")
+
+(defvar ebuild-mode-cvs-header-regexp
+  "^#[ \t]*\\$\\(Id\\|Header\\)\\(: .*\\)?\\$[ \t]*$")
+
 (defvar ebuild-mode-licenses
   (condition-case nil
       (directory-files (concat ebuild-mode-portdir "/licenses")
@@ -232,11 +248,39 @@ Optional argument LIMIT restarts collection after that number of elements."
 	    (delete-region (match-beginning 0) (point))
 	    (indent-to end-col)))))))
 
+(defun ebuild-mode-update-copyright ()
+  ;; Update copyright years
+  (save-excursion
+    (goto-char (point-min))
+    (let ((case-fold-search nil))
+      (if (re-search-forward ebuild-mode-copyright-regexp 400 t)
+	  (let ((first-year (string-to-number (match-string 1)))
+		(last-year (string-to-number (match-string 2)))
+		(this-year-string (format-time-string "%Y")))
+	    (if (and (<= 1999 first-year) ; only 2 args in GNU Emacs 23
+		     (<= first-year last-year)
+		     (<= last-year (string-to-number this-year-string)))
+		(replace-match this-year-string t t nil 2)
+	      (lwarn 'ebuild-mode :warning
+		     "Suspicious range of copyright years: %d-%d"
+		     first-year last-year)))))))
+
+(defun ebuild-mode-delete-cvs-line ()
+  ;; Remove a CVS $Id$ or $Header$ line
+  (save-excursion
+    (goto-char (point-min))
+    (let ((case-fold-search nil))
+      (if (re-search-forward ebuild-mode-cvs-header-regexp 400 t)
+	  (delete-region (match-beginning 0) (1+ (point)))))))
+
 (defun ebuild-mode-before-save ()
   (when ebuild-mode-fix-whitespace
     (delete-trailing-whitespace)
     (ebuild-mode-tabify))
-  ;;(copyright-update)			; doesn't exist in XEmacs
+  (when ebuild-mode-update-copyright
+    (ebuild-mode-update-copyright))
+  (when ebuild-mode-delete-cvs-line
+    (ebuild-mode-delete-cvs-line))
   ;; return nil, otherwise the file is presumed to be written
   nil)