From 042b62e6bb208914f14a92a278ce3e2c89e34ea8 Mon Sep 17 00:00:00 2001
From: Stefan Kangas <stefankangas@gmail.com>
Date: Thu, 26 Sep 2019 12:31:37 +0200
Subject: [PATCH] Declare unused vhdl code in align.el obsolete

* lisp/align.el (align-vhdl-rules-list, align-set-vhdl-rules): Declare
obsolete.  (Bug#6207)
(align-dq-string-modes, align-open-comment-modes): Move vhdl-mode to
definition instead of adding it later.
---
 lisp/align.el | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/lisp/align.el b/lisp/align.el
index cd72d52df4..d83f8341c9 100644
--- a/lisp/align.el
+++ b/lisp/align.el
@@ -206,7 +206,7 @@ align-text-modes
 
 (defcustom align-dq-string-modes
   (append align-lisp-modes align-c++-modes align-perl-modes
-	  '(python-mode))
+          '(python-mode vhdl-mode))
   "A list of modes where double quoted strings should be excluded."
   :type '(repeat symbol)
   :group 'align)
@@ -219,7 +219,7 @@ align-sq-string-modes
 
 (defcustom align-open-comment-modes
   (append align-lisp-modes align-c++-modes align-perl-modes
-	  '(python-mode makefile-mode))
+          '(python-mode makefile-mode vhdl-mode))
   "A list of modes with a single-line comment syntax.
 These are comments as in Lisp, which have a beginning, but end with
 the line (i.e., `comment-end' is an empty string)."
@@ -805,9 +805,7 @@ align-highlight-overlays
 (defvar align-regexp-history nil
   "Input history for the full user-entered regex in `align-regexp'")
 
-;; Sample extension rule set, for vhdl-mode.  This should properly be
-;; in vhdl-mode.el itself.
-
+;; Sample extension rule set for vhdl-mode.  This is now obsolete.
 (defcustom align-vhdl-rules-list
   `((vhdl-declaration
      (regexp   . "\\(signal\\|variable\\|constant\\)\\(\\s-+\\)\\S-")
@@ -842,18 +840,14 @@ align-vhdl-rules-list
   "Alignment rules for `vhdl-mode'.  See `align-rules-list' for more info."
   :type align-rules-list-type
   :group 'align)
-
 (put 'align-vhdl-rules-list 'risky-local-variable t)
+(make-obsolete-variable 'align-vhdl-rules-list "no longer used." "27.1")
 
 (defun align-set-vhdl-rules ()
   "Setup the `align-mode-rules-list' variable for `vhdl-mode'."
+  (declare (obsolete nil "27.1"))
   (setq align-mode-rules-list align-vhdl-rules-list))
 
-(add-hook 'vhdl-mode-hook 'align-set-vhdl-rules)
-
-(add-to-list 'align-dq-string-modes 'vhdl-mode)
-(add-to-list 'align-open-comment-modes 'vhdl-mode)
-
 ;;; User Functions:
 
 ;;;###autoload
-- 
2.20.1