Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

16 files changed, 23 insertions, 26 deletions

diff --git a/etc/srecode/c.srt b/etc/srecode/c.srt
index 720da3daab4..fe029a3c32b 100644
--- a/etc/srecode/c.srt
+++ b/etc/srecode/c.srt
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 set mode "c-mode"
 
@@ -131,7 +131,7 @@ Override this with your own preference to avoid using doxygen"
 ----
 
 ;;; DOXYGEN FEATURES
-;; 
+;;
 ;;
 context declaration
 
diff --git a/etc/srecode/cpp.srt b/etc/srecode/cpp.srt
index 444c14d819d..6468eadc1d5 100644
--- a/etc/srecode/cpp.srt
+++ b/etc/srecode/cpp.srt
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 set mode "c++-mode"
 
@@ -56,7 +56,7 @@ Override this to affect applications, or the outer class structure for
 the user-facing template."
 ----
 class {{?NAME}} {{#PARENTS}}{{#FIRST}}: {{/FIRST}}public {{NAME}}{{/PARENTS}}
-{     
+{
    {{^}}
 };
 ----
@@ -111,7 +111,7 @@ Override this with your own preference to avoid using doxygen."
 ----
 
 ;;; DOXYGEN FEATURES
-;; 
+;;
 ;;
 context classdecl
 
diff --git a/etc/srecode/default.srt b/etc/srecode/default.srt
index f7a8f09fc3a..d8c7cd1be11 100644
--- a/etc/srecode/default.srt
+++ b/etc/srecode/default.srt
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 set mode "default"
 
@@ -34,7 +34,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program.  If not, see http://www.gnu.org/licenses/."
+along with this program.  If not, see https://www.gnu.org/licenses/."
 
 set DOLLAR "$"
 
diff --git a/etc/srecode/doc-cpp.srt b/etc/srecode/doc-cpp.srt
index 486bb630574..e23b37b8836 100644
--- a/etc/srecode/doc-cpp.srt
+++ b/etc/srecode/doc-cpp.srt
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 set mode "c-mode"
 
diff --git a/etc/srecode/doc-default.srt b/etc/srecode/doc-default.srt
index 30a83118637..3290d6a84c2 100644
--- a/etc/srecode/doc-default.srt
+++ b/etc/srecode/doc-default.srt
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 set mode "default"
 
diff --git a/etc/srecode/doc-java.srt b/etc/srecode/doc-java.srt
index a3a294d67fb..ab0edb8193a 100644
--- a/etc/srecode/doc-java.srt
+++ b/etc/srecode/doc-java.srt
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 set mode "java-mode"
 
diff --git a/etc/srecode/ede-autoconf.srt b/etc/srecode/ede-autoconf.srt
index c25416eb13c..c75997dc00e 100644
--- a/etc/srecode/ede-autoconf.srt
+++ b/etc/srecode/ede-autoconf.srt
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 set mode "autoconf-mode"
 set escape_start "{{"
diff --git a/etc/srecode/ede-make.srt b/etc/srecode/ede-make.srt
index 448534234c9..0c7d5668754 100644
--- a/etc/srecode/ede-make.srt
+++ b/etc/srecode/ede-make.srt
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 set mode "makefile-mode"
 set escape_start "{{"
diff --git a/etc/srecode/el.srt b/etc/srecode/el.srt
index cc3f1e8e81b..66db5666c0b 100644
--- a/etc/srecode/el.srt
+++ b/etc/srecode/el.srt
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 set escape_start "$"
 set escape_end "$"
@@ -307,5 +307,3 @@ bind "s"
 
 
 ;; end
-
-
diff --git a/etc/srecode/getset-cpp.srt b/etc/srecode/getset-cpp.srt
index 9f4341d039a..50f5d224cbe 100644
--- a/etc/srecode/getset-cpp.srt
+++ b/etc/srecode/getset-cpp.srt
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 set mode "c++-mode"
 set application "getset"
@@ -47,4 +47,3 @@ f{{NAME}}(){{#NOTLAST}},{{/NOTLAST}}
 ----
 
 ;; end
-
diff --git a/etc/srecode/java.srt b/etc/srecode/java.srt
index db154dbf687..cfc55f8d794 100644
--- a/etc/srecode/java.srt
+++ b/etc/srecode/java.srt
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 set mode "java-mode"
 set escape_start "{{"
@@ -162,8 +162,8 @@ template javadoc-class :indent :blank :time :user :tag
  * Created: {{DATE}}
  *
  * @author {{AUTHOR}}
- * @version 
- * @since 
+ * @version
+ * @since
  */
 ----
 
diff --git a/etc/srecode/make.srt b/etc/srecode/make.srt
index af2e950cfe8..ef5f1bece7d 100644
--- a/etc/srecode/make.srt
+++ b/etc/srecode/make.srt
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 set mode "makefile-mode"
 set escape_start "{{"
diff --git a/etc/srecode/template.srt b/etc/srecode/template.srt
index deb901f2db3..8403a698614 100644
--- a/etc/srecode/template.srt
+++ b/etc/srecode/template.srt
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 set escape_start "$"
 set escape_end "$"
diff --git a/etc/srecode/test.srt b/etc/srecode/test.srt
index 4e567adf79b..9843e5338a7 100644
--- a/etc/srecode/test.srt
+++ b/etc/srecode/test.srt
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 set mode "srecode-template-mode"
 set escape_start "$"
@@ -83,7 +83,7 @@ template gapsomething :blank
 template inlinetext
 "Insert text that has no newlines"
 ----
- *In the middle* 
+ *In the middle*
 ----
 
 template includable :blank
diff --git a/etc/srecode/texi.srt b/etc/srecode/texi.srt
index 52acb77f21a..def3b48d231 100644
--- a/etc/srecode/texi.srt
+++ b/etc/srecode/texi.srt
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 set mode "texinfo-mode"
 
diff --git a/etc/srecode/wisent.srt b/etc/srecode/wisent.srt
index ac59d770f5e..7e8726cbac1 100644
--- a/etc/srecode/wisent.srt
+++ b/etc/srecode/wisent.srt
@@ -17,7 +17,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 set mode "wisent-grammar-mode"
 set comment_start  ";;"