Merge from origin/emacs-25

9a857b9 * admin/authors.el (authors-renamed-files-alist): Addition.
6d27423 Tweak refcard note about documentation location
e46a134 Improve treatment of Fortran's "class is"

24 files changed, 72 insertions, 86 deletions

diff --git a/admin/authors.el b/admin/authors.el
index 54c23207fee..5a97c854a62 100644
--- a/admin/authors.el
+++ b/admin/authors.el
@@ -856,7 +856,7 @@ in the repository.")
     ("emacs-lisp/assoc.el" . "assoc.el")
     ("emacs-lisp/cust-print.el" . "cust-print.el")
     ("emacs-lisp/gulp.el" . "gulp.el")
-    ("lisp/abbrevlist.el" . "abbrevlist.el")
+    ("abbrevlist.el" . "abbrevlist.el")
     ("emulation/crisp.el" . "crisp.el")
     ("emulation/tpu-edt.el" . "tpu-edt.el")
     ("emulation/tpu-extras.el" . "tpu-extras.el")
diff --git a/etc/refcards/calccard.tex b/etc/refcards/calccard.tex
index e692ca4b7d9..352c7c2a4f1 100644
--- a/etc/refcards/calccard.tex
+++ b/etc/refcards/calccard.tex
@@ -81,8 +81,8 @@
 
 Released under the terms of the GNU General Public License version 3 or later.
 
-\TeX{} source for this card is distributed with Emacs in {\tt etc/refcards/}
-
+For more Emacs documentation, and the \TeX{} source for this card,
+see the Emacs distribution, or {\tt http://www.gnu.org/software/emacs}
 \endgroup}
 
 % make \bye not \outer so that the \def\bye in the \else clause below
diff --git a/etc/refcards/cs-dired-ref.tex b/etc/refcards/cs-dired-ref.tex
index c36167d5619..0cab2957134 100644
--- a/etc/refcards/cs-dired-ref.tex
+++ b/etc/refcards/cs-dired-ref.tex
@@ -63,11 +63,8 @@
 
 Released under the terms of the GNU General Public License version 3 or later.
 
-\TeX{} source for this card is distributed with Emacs in {\tt etc/refcards/}
-
-For copies of the GNU Emacs manual, see:
-
-{\tt http://www.gnu.org/software/emacs/\#Manuals}
+For more Emacs documentation, and the \TeX{} source for this card,
+see the Emacs distribution, or {\tt http://www.gnu.org/software/emacs}
 \endgroup}
 
 % make \bye not \outer so that the \def\bye in the \else clause below
diff --git a/etc/refcards/cs-refcard.tex b/etc/refcards/cs-refcard.tex
index 154831029ab..64590fe5923 100644
--- a/etc/refcards/cs-refcard.tex
+++ b/etc/refcards/cs-refcard.tex
@@ -80,11 +80,8 @@
 
 Released under the terms of the GNU General Public License version 3 or later.
 
-\TeX{} source for this card is distributed with Emacs in {\tt etc/refcards/}
-
-For copies of the GNU Emacs manual, see:
-
-{\tt http://www.gnu.org/software/emacs/\#Manuals}
+For more Emacs documentation, and the \TeX{} source for this card,
+see the Emacs distribution, or {\tt http://www.gnu.org/software/emacs}
 \endgroup}
 
 % make \bye not \outer so that the \def\bye in the \else clause below
diff --git a/etc/refcards/cs-survival.tex b/etc/refcards/cs-survival.tex
index 77893aec3ac..6e15f1f514b 100644
--- a/etc/refcards/cs-survival.tex
+++ b/etc/refcards/cs-survival.tex
@@ -70,8 +70,9 @@
     Released under the terms of the GNU General Public License
     version 3 or later.
 
-    \TeX{} source for this card is distributed with Emacs in
-    {\tt etc/refcards/}\par}}
+    For more Emacs documentation, and the \TeX{} source for this card,
+    see the Emacs distribution, or
+    {\tt http://www.gnu.org/software/emacs}\par}}
 
 \hsize 3.2in
 \vsize 7.95in
diff --git a/etc/refcards/de-refcard.tex b/etc/refcards/de-refcard.tex
index 89636a84509..b6d6c211d9e 100644
--- a/etc/refcards/de-refcard.tex
+++ b/etc/refcards/de-refcard.tex
@@ -82,11 +82,8 @@
 Released under the terms of the GNU General Public License
 version 3 or later.
 
-\TeX{} source for this card is distributed with Emacs in {\tt etc/refcards/}
-
-F\"ur Kopien des Handbuchs zu GNU Emacs:
-
-{\tt http://www.gnu.org/software/emacs/\#Manuals}
+For more Emacs documentation, and the \TeX{} source for this card,
+see the Emacs distribution, or {\tt http://www.gnu.org/software/emacs}
 \endgroup}
 
 % make \bye not \outer so that the \def\bye in the \else clause below
diff --git a/etc/refcards/dired-ref.tex b/etc/refcards/dired-ref.tex
index 5f8d8babcc3..4b9f41f60b8 100644
--- a/etc/refcards/dired-ref.tex
+++ b/etc/refcards/dired-ref.tex
@@ -64,11 +64,8 @@
 
 Released under the terms of the GNU General Public License version 3 or later.
 
-\TeX{} source for this card is distributed with Emacs in {\tt etc/refcards/}
-
-For copies of the GNU Emacs manual, see:
-
-{\tt http://www.gnu.org/software/emacs/\#Manuals}
+For more Emacs documentation, and the \TeX{} source for this card,
+see the Emacs distribution, or {\tt http://www.gnu.org/software/emacs}
 \endgroup}
 
 % make \bye not \outer so that the \def\bye in the \else clause below
diff --git a/etc/refcards/fr-dired-ref.tex b/etc/refcards/fr-dired-ref.tex
index 913372bc8cd..d04b362bc2d 100644
--- a/etc/refcards/fr-dired-ref.tex
+++ b/etc/refcards/fr-dired-ref.tex
@@ -58,11 +58,8 @@
 Released under the terms of the GNU General Public License
 version 3 or later.
 
-\TeX{} source for this card is distributed with Emacs in {\tt etc/refcards/}
-
-Pour obtenir des copies du manuel de GNU Emacs:
-
-{\tt http://www.gnu.org/software/emacs/\#Manuals}
+For more Emacs documentation, and the \TeX{} source for this card,
+see the Emacs distribution, or {\tt http://www.gnu.org/software/emacs}
 \endgroup}
 
 % make \bye not \outer so that the \def\bye in the \else clause below
diff --git a/etc/refcards/fr-refcard.tex b/etc/refcards/fr-refcard.tex
index ddaa85befbe..73e630749df 100644
--- a/etc/refcards/fr-refcard.tex
+++ b/etc/refcards/fr-refcard.tex
@@ -78,11 +78,8 @@
 
 Released under the terms of the GNU General Public License version 3 or later.
 
-\TeX{} source for this card is distributed with Emacs in {\tt etc/refcards/}
-
-Pour des copies du manuel GNU Emacs:
-
-{\tt http://www.gnu.org/software/emacs/\#Manuals}
+For more Emacs documentation, and the \TeX{} source for this card,
+see the Emacs distribution, or {\tt http://www.gnu.org/software/emacs}
 \endgroup}
 
 % make \bye not \outer so that the \def\bye in the \else clause below
diff --git a/etc/refcards/fr-survival.tex b/etc/refcards/fr-survival.tex
index a6279e80d40..e2a338e135a 100644
--- a/etc/refcards/fr-survival.tex
+++ b/etc/refcards/fr-survival.tex
@@ -65,8 +65,9 @@
     Released under the terms of the GNU General Public License
     version 3 or later.
 
-    \TeX{} source for this card is distributed with Emacs in {\tt
-      etc/refcards/}\par}}
+    For more Emacs documentation, and the \TeX{} source for this card,
+    see the Emacs distribution,
+    or {\tt http://www.gnu.org/software/emacs}\par}}
 
 \hsize 3.2in
 \vsize 7.95in
diff --git a/etc/refcards/gnus-refcard.tex b/etc/refcards/gnus-refcard.tex
index 46d0d7df225..6e5f2c3614f 100644
--- a/etc/refcards/gnus-refcard.tex
+++ b/etc/refcards/gnus-refcard.tex
@@ -125,7 +125,8 @@
 
   Released under the terms of the GNU General Public License version 3 or later.
 
-  \TeX{} source for this card is distributed with Emacs in {\tt etc/refcards/}
+  For more Emacs documentation, and the \TeX{} source for this card,
+  see the Emacs distribution, or {\tt http://www.gnu.org/software/emacs}
 
   Please send corrections, additions and suggestions to the
   current maintainer's email address. \Guide{} last edited on \date.
diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex
index a5a66264557..d814de5372a 100644
--- a/etc/refcards/orgcard.tex
+++ b/etc/refcards/orgcard.tex
@@ -80,7 +80,8 @@
 \centerline{Released under the terms of the GNU General Public License}
 \centerline{version 3 or later.}
 
-\centerline{\TeX{} source for this card is distributed with Emacs in {\tt etc/refcards/}}
+\centerline{For more Emacs documentation, and the \TeX{} source for this card, see}
+\centerline{the Emacs distribution, or {\tt http://www.gnu.org/software/emacs}}
 
 \endgroup}
 
diff --git a/etc/refcards/pl-refcard.tex b/etc/refcards/pl-refcard.tex
index 788bb2abea8..121c79cfc44 100644
--- a/etc/refcards/pl-refcard.tex
+++ b/etc/refcards/pl-refcard.tex
@@ -90,11 +90,8 @@
 
 Released under the terms of the GNU General Public License version 3 or later.
 
-\TeX{} source for this card is distributed with Emacs in {\tt etc//refcards//}
-
-For copies of the GNU Emacs manual, see:
-
-{\tt http:////www.gnu.org//software//emacs//\#Manuals}
+For more Emacs documentation, and the \TeX{} source for this card,
+see the Emacs distribution, or {\tt http:////www.gnu.org//software//emacs}
 \endgroup}
 
 % make \bye not \outer so that the \def\bye in the \else clause below
diff --git a/etc/refcards/pt-br-refcard.tex b/etc/refcards/pt-br-refcard.tex
index 27849a3d8d3..7f70d8e80ce 100644
--- a/etc/refcards/pt-br-refcard.tex
+++ b/etc/refcards/pt-br-refcard.tex
@@ -83,11 +83,8 @@
 
 Released under the terms of the GNU General Public License version 3 or later.
 
-\TeX{} source for this card is distributed with Emacs in {\tt etc/refcards/}
-
-For copies of the GNU Emacs manual, see:
-
-{\tt http://www.gnu.org/software/emacs/\#Manuals}
+For more Emacs documentation, and the \TeX{} source for this card,
+see the Emacs distribution, or {\tt http://www.gnu.org/software/emacs}
 \endgroup}
 
 % make \bye not \outer so that the \def\bye in the \else clause below
diff --git a/etc/refcards/refcard.tex b/etc/refcards/refcard.tex
index 6eefd1560ce..afeaeec63a2 100644
--- a/etc/refcards/refcard.tex
+++ b/etc/refcards/refcard.tex
@@ -81,11 +81,8 @@
 
 Released under the terms of the GNU General Public License version 3 or later.
 
-\TeX{} source for this card is distributed with Emacs in {\tt etc/refcards/}
-
-For copies of the GNU Emacs manual, see:
-
-{\tt http://www.gnu.org/software/emacs/\#Manuals}
+For more Emacs documentation, and the \TeX{} source for this card,
+see the Emacs distribution, or {\tt http://www.gnu.org/software/emacs}
 \endgroup}
 
 % make \bye not \outer so that the \def\bye in the \else clause below
diff --git a/etc/refcards/ru-refcard.tex b/etc/refcards/ru-refcard.tex
index 1d96473fa6c..a72d08138b2 100644
--- a/etc/refcards/ru-refcard.tex
+++ b/etc/refcards/ru-refcard.tex
@@ -54,13 +54,11 @@
 \centerline{Designed by Stephen Gildea}
 \centerline{Перевод Alex Ott <alexott@gmail.com>}
 
-Released under the terms of the GNU General Public License version 3 or later.
+\centerline{Released under the terms of the GNU General Public License
+  version 3 or later.}
 
-\TeX{} source for this card is distributed with Emacs in {\tt etc/refcards/}
-
-For copies of the GNU Emacs manual, see:
-
-{\tt http://www.gnu.org/software/emacs/\#Manuals}
+\centerline{For more Emacs documentation, and the \TeX{} source for this card,}
+\centerline{see the Emacs distribution, or {\tt http://www.gnu.org/software/emacs}}
 \endgroup}
 
 \hyphenation{mini-buf-fer}
diff --git a/etc/refcards/sk-dired-ref.tex b/etc/refcards/sk-dired-ref.tex
index 81f112270f0..25f67d0f44b 100644
--- a/etc/refcards/sk-dired-ref.tex
+++ b/etc/refcards/sk-dired-ref.tex
@@ -64,11 +64,8 @@
 
 Released under the terms of the GNU General Public License version 3 or later.
 
-\TeX{} source for this card is distributed with Emacs in {\tt etc/refcards/}
-
-For copies of the GNU Emacs manual, see:
-
-{\tt http://www.gnu.org/software/emacs/\#Manuals}
+For more Emacs documentation, and the \TeX{} source for this card,
+see the Emacs distribution, or {\tt http://www.gnu.org/software/emacs}
 \endgroup}
 
 % make \bye not \outer so that the \def\bye in the \else clause below
diff --git a/etc/refcards/sk-refcard.tex b/etc/refcards/sk-refcard.tex
index 27b3a38cd9c..83b27ef6a83 100644
--- a/etc/refcards/sk-refcard.tex
+++ b/etc/refcards/sk-refcard.tex
@@ -81,11 +81,8 @@
 
 Released under the terms of the GNU General Public License version 3 or later.
 
-\TeX{} source for this card is distributed with Emacs in {\tt etc/refcards/}
-
-For copies of the GNU Emacs manual, see:
-
-{\tt http://www.gnu.org/software/emacs/\#Manuals}
+For more Emacs documentation, and the \TeX{} source for this card,
+see the Emacs distribution, or {\tt http://www.gnu.org/software/emacs}
 \endgroup}
 
 % make \bye not \outer so that the \def\bye in the \else clause below
diff --git a/etc/refcards/sk-survival.tex b/etc/refcards/sk-survival.tex
index 152009bd86f..27b1a78b47f 100644
--- a/etc/refcards/sk-survival.tex
+++ b/etc/refcards/sk-survival.tex
@@ -72,8 +72,9 @@
     Released under the terms of the GNU General Public License
     version 3 or later.
 
-    \TeX{} source for this card is distributed with Emacs in
-    {\tt etc/refcards/}\par}}
+    For more Emacs documentation, and the \TeX{} source for this card,
+    see the Emacs distribution,
+    or {\tt http://www.gnu.org/software/emacs}\par}}
 
 \hsize 3.2in
 \vsize 7.95in
diff --git a/etc/refcards/survival.tex b/etc/refcards/survival.tex
index 2d81b309906..1bdeb63d163 100644
--- a/etc/refcards/survival.tex
+++ b/etc/refcards/survival.tex
@@ -59,8 +59,9 @@
     Released under the terms of the GNU General Public License
     version 3 or later.
 
-    \TeX{} source for this card is distributed with Emacs in
-    {\tt etc/refcards/}\par}}
+    For more Emacs documentation, and the \TeX{} source for this card,
+    see the Emacs distribution,
+    or {\tt http://www.gnu.org/software/emacs}\par}}
 
 \hsize 3.2in
 \vsize 7.95in
diff --git a/etc/refcards/vipcard.tex b/etc/refcards/vipcard.tex
index 5eca55cc582..e4edfdbc15c 100644
--- a/etc/refcards/vipcard.tex
+++ b/etc/refcards/vipcard.tex
@@ -73,11 +73,8 @@
 
 Released under the terms of the GNU General Public License version 3 or later.
 
-\TeX{} source for this card is distributed with Emacs in {\tt etc/refcards/}
-
-For copies of the GNU Emacs manual, see:
-
-{\tt http://www.gnu.org/software/emacs/\#Manuals}
+For more Emacs documentation, and the \TeX{} source for this card,
+see the Emacs distribution, or {\tt http://www.gnu.org/software/emacs}
 \endgroup}
 
 % make \bye not \outer so that the \def\bye in the \else clause below
diff --git a/etc/refcards/viperCard.tex b/etc/refcards/viperCard.tex
index d984ffc484f..66d65efdff1 100644
--- a/etc/refcards/viperCard.tex
+++ b/etc/refcards/viperCard.tex
@@ -77,11 +77,8 @@
 
 Released under the terms of the GNU General Public License version 3 or later.
 
-\TeX{} source for this card is distributed with Emacs in {\tt etc/refcards/}
-
-For copies of the GNU Emacs manual, see:
-
-{\tt http://www.gnu.org/software/emacs/\#Manuals}
+For more Emacs documentation, and the \TeX{} source for this card,
+see the Emacs distribution, or {\tt http://www.gnu.org/software/emacs}
 \endgroup}
 
 % make \bye not \outer so that the \def\bye in the \else clause below
diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el
index 58397530e4f..d9a34720046 100644
--- a/lisp/progmodes/f90.el
+++ b/lisp/progmodes/f90.el
@@ -895,8 +895,10 @@ Can be overridden by the value of `font-lock-maximum-decoration'.")
 
 ;; This is for a TYPE block, not a variable of derived TYPE.
 ;; Hence no need to add CLASS for F2003.
+;; Note that this also matches "type is", so you might need to use
+;; f90-typeis-re as well.
 (defconst f90-type-def-re
-  ;; type word
+  ;; type word    (includes "type is")
   ;; type :: word
   ;; type, attr-list :: word
   ;;   where attr-list = attr [, attr ...]
@@ -953,7 +955,7 @@ Used in the F90 entry in `hs-special-modes-alist'.")
    ;; Avoid F2003 "type is" in "select type",
    ;; and also variables of derived type "type (foo)".
    ;; "type, foo" must be a block (?).
-   "type[ \t,]\\("
+   "\\(?:type\\|class\\)[ \t,]\\("
    "[^i(!\n\"& \t]\\|"                 ; not-i(
    "i[^s!\n\"& \t]\\|"                 ; i not-s
    "is\\(?:\\sw\\|\\s_\\)\\)\\|"
@@ -1452,6 +1454,7 @@ if all else fails."
     (not (or (looking-at "end")
              (looking-at "\\(do\\|if\\|else\\(if\\|where\\)?\
 \\|select[ \t]*\\(case\\|type\\)\\|case\\|where\\|forall\\|\
+\\(?:class\\|type\\)[ \t]*is\\|\
 block\\|critical\\|enum\\|associate\\)\\_>")
              (looking-at "\\(program\\|\\(?:sub\\)?module\\|\
 \\(?:abstract[ \t]*\\)?interface\\|block[ \t]*data\\)\\_>")
diff --git a/test/lisp/progmodes/f90.el b/test/lisp/progmodes/f90.el
index fece86ca1d8..29c608847f1 100644
--- a/test/lisp/progmodes/f90.el
+++ b/test/lisp/progmodes/f90.el
@@ -255,4 +255,22 @@ end program prog")
     (forward-line -2)
     (should (= 5 (current-indentation)))))
 
+(ert-deftest f90-test-bug25039 ()
+  "Test for http://debbugs.gnu.org/25039 ."
+  (with-temp-buffer
+    (f90-mode)
+    (insert "program prog
+select type (a)
+class is (c1)
+x = 1
+type is (t1)
+x = 2
+end select
+end program prog")
+    (f90-indent-subprogram)
+    (forward-line -3)
+    (should (= 2 (current-indentation))) ; type is
+    (forward-line -2)
+    (should (= 2 (current-indentation))))) ; class is
+
 ;;; f90.el ends here