mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-27 08:43:40 -07:00
Code Issues Projects Releases Wiki Activity

Merge from origin/emacs-25

Browse source 
9a857b9 * admin/authors.el (authors-renamed-files-alist): Addition.
6d27423 Tweak refcard note about documentation location
e46a134 Improve treatment of Fortran's "class is"
This commit is contained in:
Paul Eggert 2016-12-07 12:39:08 -08:00
commit fd6632b397
24 changed files with 72 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

2
admin/authors.el
View file

@ -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")

4
etc/refcards/calccard.tex
View file

@ -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

7
etc/refcards/cs-dired-ref.tex
View file

@ -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

7
etc/refcards/cs-refcard.tex
View file

@ -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

5
etc/refcards/cs-survival.tex
View file

@ -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

7
etc/refcards/de-refcard.tex
View file

@ -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

7
etc/refcards/dired-ref.tex
View file

@ -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

7
etc/refcards/fr-dired-ref.tex
View file

@ -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

7
etc/refcards/fr-refcard.tex
View file

@ -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

5
etc/refcards/fr-survival.tex
View file

@ -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

3
etc/refcards/gnus-refcard.tex
View file

@ -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.

3
etc/refcards/orgcard.tex
View file

@ -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}

7
etc/refcards/pl-refcard.tex
View file

@ -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

7
etc/refcards/pt-br-refcard.tex
View file

@ -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

7
etc/refcards/refcard.tex
View file

@ -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

10
etc/refcards/ru-refcard.tex
View file

@ -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}

7
etc/refcards/sk-dired-ref.tex
View file

@ -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

7
etc/refcards/sk-refcard.tex
View file

@ -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

5
etc/refcards/sk-survival.tex
View file

@ -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

5
etc/refcards/survival.tex
View file

@ -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

7
etc/refcards/vipcard.tex
View file

@ -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

7
etc/refcards/viperCard.tex
View file

@ -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

7
lisp/progmodes/f90.el
View file

@ -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\\)\\_>")

18
test/lisp/progmodes/f90.el
View file

@ -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