diff options
Diffstat (limited to 'lisp/textmodes')
| -rw-r--r-- | lisp/textmodes/conf-mode.el | 2 | ||||
| -rw-r--r-- | lisp/textmodes/fill.el | 2 | ||||
| -rw-r--r-- | lisp/textmodes/paragraphs.el | 4 | ||||
| -rw-r--r-- | lisp/textmodes/po.el | 2 | ||||
| -rw-r--r-- | lisp/textmodes/reftex-vars.el | 7 | ||||
| -rw-r--r-- | lisp/textmodes/rst.el | 15 | ||||
| -rw-r--r-- | lisp/textmodes/tex-mode.el | 2 | ||||
| -rw-r--r-- | lisp/textmodes/texinfo.el | 2 | ||||
| -rw-r--r-- | lisp/textmodes/tildify.el | 5 |
9 files changed, 15 insertions, 26 deletions
diff --git a/lisp/textmodes/conf-mode.el b/lisp/textmodes/conf-mode.el index 770571a264e..7d81bbca7d5 100644 --- a/lisp/textmodes/conf-mode.el +++ b/lisp/textmodes/conf-mode.el @@ -1,4 +1,4 @@ -;;; conf-mode.el --- Simple major mode for editing conf/ini/properties files -*- coding: utf-8 -*- +;;; conf-mode.el --- Simple major mode for editing conf/ini/properties files ;; Copyright (C) 2004-2015 Free Software Foundation, Inc. diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el index 5f2fbcda04c..a97facf5427 100644 --- a/lisp/textmodes/fill.el +++ b/lisp/textmodes/fill.el @@ -1,4 +1,4 @@ -;;; fill.el --- fill commands for Emacs -*- coding: utf-8 -*- +;;; fill.el --- fill commands for Emacs ;; Copyright (C) 1985-1986, 1992, 1994-1997, 1999, 2001-2015 Free ;; Software Foundation, Inc. diff --git a/lisp/textmodes/paragraphs.el b/lisp/textmodes/paragraphs.el index 8bcc71ed531..58c65678802 100644 --- a/lisp/textmodes/paragraphs.el +++ b/lisp/textmodes/paragraphs.el @@ -536,8 +536,4 @@ the current sentence with the one containing the mark." (interactive "*p") (transpose-subr 'forward-sentence arg)) -;; Local Variables: -;; coding: utf-8 -;; End: - ;;; paragraphs.el ends here diff --git a/lisp/textmodes/po.el b/lisp/textmodes/po.el index 99ec2916067..a5f39461498 100644 --- a/lisp/textmodes/po.el +++ b/lisp/textmodes/po.el @@ -1,4 +1,4 @@ -;;; po.el --- basic support of PO translation files -*- coding: utf-8; -*- +;;; po.el --- basic support of PO translation files ;; Copyright (C) 1995-1998, 2000-2015 Free Software Foundation, Inc. diff --git a/lisp/textmodes/reftex-vars.el b/lisp/textmodes/reftex-vars.el index 357a0938e6a..97c8af365e8 100644 --- a/lisp/textmodes/reftex-vars.el +++ b/lisp/textmodes/reftex-vars.el @@ -85,8 +85,9 @@ (supertab "Supertabular environment" (("supertabular" ?t nil nil "\\tablecaption{"))) - (wrapfig "The wrapfigure environment" - (("wrapfigure" ?f nil nil caption))) + (wrapfig "The wrapfig package" + (("wrapfigure" ?f nil nil caption) + ("wraptable" ?t nil nil caption))) (ctable "The ctable package" (("\\ctable[]{}{}{}" ?t "tab:" "~\\ref{%s}" 1 ("table" "Tabelle")))) @@ -653,7 +654,7 @@ Possible keys are sectioning macro names like `chapter', section levels (string :tag "Prefix")))) (defcustom reftex-default-context-regexps - '((caption . "\\\\\\(rot\\)?caption\\*?[[{]") + '((caption . "\\\\\\(rot\\|bi\\)?\\(sub\\)?caption\\(box\\)?\\*?[[{]") (item . "\\\\item\\(\\[[^]]*\\]\\)?") (eqnarray-like . "\\\\begin{%s}\\|\\\\\\\\") (alignat-like . "\\\\begin{%s}{[0-9]*}\\|\\\\\\\\")) diff --git a/lisp/textmodes/rst.el b/lisp/textmodes/rst.el index 4c234c9a31f..7b2aabd7ea5 100644 --- a/lisp/textmodes/rst.el +++ b/lisp/textmodes/rst.el @@ -218,7 +218,7 @@ and before TAIL-RE and DELIM-RE in VAR or DEFAULT for no match." ;; Use CVSHeader to really get information from CVS and not other version ;; control systems. (defconst rst-cvs-header - "$CVSHeader: sm/rst_el/rst.el,v 1.327.2.6 2012-10-07 13:05:50 stefan Exp $") + "$CVSHeader: sm/rst_el/rst.el,v 1.327.2.26 2015/10/04 09:26:04 stefan Exp $") (defconst rst-cvs-rev (rst-extract-version "\\$" "CVSHeader: \\S + " "[0-9]+\\(?:\\.[0-9]+\\)+" " .*" rst-cvs-header "0.0") @@ -232,22 +232,22 @@ and before TAIL-RE and DELIM-RE in VAR or DEFAULT for no match." ;; Use LastChanged... to really get information from SVN. (defconst rst-svn-rev (rst-extract-version "\\$" "LastChangedRevision: " "[0-9]+" " " - "$LastChangedRevision: 7515 $") + "$LastChangedRevision: 7925 $") "The SVN revision of this file. SVN revision is the upstream (docutils) revision.") (defconst rst-svn-timestamp (rst-extract-version "\\$" "LastChangedDate: " ".+?+" " " - "$LastChangedDate: 2012-09-20 23:28:53 +0200 (Thu, 20 Sep 2012) $") + "$LastChangedDate: 2015-10-04 11:21:35 +0200 (Sun, 04 Oct 2015) $") "The SVN time stamp of this file.") ;; Maintained by the release process. (defconst rst-official-version (rst-extract-version "%" "OfficialVersion: " "[0-9]+\\(?:\\.[0-9]+\\)+" " " - "%OfficialVersion: 1.4.0 %") + "%OfficialVersion: 1.4.1 %") "Official version of the package.") (defconst rst-official-cvs-rev (rst-extract-version "[%$]" "Revision: " "[0-9]+\\(?:\\.[0-9]+\\)+" " " - "%Revision: 1.327 %") + "%Revision: 1.327.2.25 %") "CVS revision of this file in the official version.") (defconst rst-version @@ -267,6 +267,7 @@ in parentheses follows the development revision and the time stamp.") ("1.3.0" . "24.3") ("1.3.1" . "24.3") ("1.4.0" . "24.3") + ("1.4.1" . "24.5") )) (unless (assoc rst-official-version rst-package-emacs-version-alist) @@ -4235,8 +4236,4 @@ column is used (fill-column vs. end of previous/next line)." (provide 'rst) -;; Local Variables: -;; coding: utf-8 -;; End: - ;;; rst.el ends here diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el index bf15b2628f9..cbeded2c61b 100644 --- a/lisp/textmodes/tex-mode.el +++ b/lisp/textmodes/tex-mode.el @@ -1,4 +1,4 @@ -;;; tex-mode.el --- TeX, LaTeX, and SliTeX mode commands -*- coding: utf-8 -*- +;;; tex-mode.el --- TeX, LaTeX, and SliTeX mode commands ;; Copyright (C) 1985-1986, 1989, 1992, 1994-1999, 2001-2015 Free ;; Software Foundation, Inc. diff --git a/lisp/textmodes/texinfo.el b/lisp/textmodes/texinfo.el index 57218177d7b..2b606ed002e 100644 --- a/lisp/textmodes/texinfo.el +++ b/lisp/textmodes/texinfo.el @@ -1,4 +1,4 @@ -;;; texinfo.el --- major mode for editing Texinfo files -*- coding: utf-8 -*- +;;; texinfo.el --- major mode for editing Texinfo files ;; Copyright (C) 1985, 1988-1993, 1996-1997, 2000-2015 Free Software ;; Foundation, Inc. diff --git a/lisp/textmodes/tildify.el b/lisp/textmodes/tildify.el index 0e645fcdd38..f1a42f2b688 100644 --- a/lisp/textmodes/tildify.el +++ b/lisp/textmodes/tildify.el @@ -508,9 +508,4 @@ variable will be set to the representation." (provide 'tildify) - -;; Local variables: -;; coding: utf-8 -;; End: - ;;; tildify.el ends here |