diff -Nru yaml-mode-0.0.9/Changes yaml-mode-0.0.13/Changes --- yaml-mode-0.0.9/Changes 2013-03-11 03:47:12.000000000 +0000 +++ yaml-mode-0.0.13/Changes 2016-11-04 21:25:25.000000000 +0000 @@ -1,7 +1,23 @@ +0.0.13 Fri Nov 4 22:23:34 CET 2016 + * Derive from text-mode, adjustments to major mode definition (wasamasa) + * Inclusion of longstanding PRs (wasamasa) + * Improved comment highlighting (wasamasa) + * Add *.raml to auto-mode-alist (Ville Skyttä) + * Map both DEL and to electric backspace (forcer) + * Change dashes from word to symbol syntax (forcer) +0.0.12 Mon Aug 17 05:34:37 UTC 2015 + * Enable encrypted yamls. (rhoml) + * Use font-lock-flush when available. (tarsius) + * Improve paragraph filling of block literals. (wentasah) +0.0.11 Tue Nov 25 08:35:56 GMT 2014 + * Fix incorrect highlighting of colons in comments. (Wilfred) +0.0.10 Mon Aug 25 04:06:50 GMT 2014 + * Remove default C-j binding. (barrkel) 0.0.9 Mon Mar 11 12:43:23 2013 - * Fix anchor name can contain '_' + * Fix anchor name can contain '_'. (Monson Shao) * `checkdoc' nits (including the `checkdoc-autoload' extension). - * Enable yaml-mode for *.yaml files. + (Samuel Bronson) + * Enable yaml-mode for *.yaml files. (Georgi Valkov) 0.0.8 Tue Feb 28 13:06:42 2012 * Replaced `last-command-char` to `last-command-event` (sugyan) * Ignore *.elc in .gitignore (semperos) diff -Nru yaml-mode-0.0.9/debian/changelog yaml-mode-0.0.13/debian/changelog --- yaml-mode-0.0.9/debian/changelog 2014-09-04 20:01:36.000000000 +0000 +++ yaml-mode-0.0.13/debian/changelog 2018-06-03 02:51:58.000000000 +0000 @@ -1,3 +1,37 @@ +yaml-mode (0.0.13-1) unstable; urgency=medium + + * This package has been adopted by the Debian Emacsen Team. + (Closes: #897315) + * New upstream version. (Closes: #893878) + * Elpafy yaml-mode: + - Create new binary package named elpa-yaml-mode. + - Use standard dependencies for elpafied packages. + - Add dummy transitional package. + - Add Breaks and Replaces to elpa-yaml-mode. + - Add elpa-yaml-mode.elpa + - Update rules to use debhelper --with elpa instead of cdbs. + - Add dh-elpa to Build-Depends. + - Drop obsolete packaging directives: yaml-mode.dirs, + yaml-mode.emacsen-install, yaml-mode.emacsen-remove, + yaml-mode.emacsen-startup, yaml-mode.install + - Add Recommends and Enhances used in all elpafied packages. + - Add 0001-Drop-upstream-makefile-and-let-dh-elpa-manage-instal.patch + to let dh-elpa manage installation and byte compilation. + - Remove unneeded debian/dirs which claimed usr/bin/ and usr/sbin/ + were part of this package. + * debian/control: + - Add myself to uploaders. + - Update Vcs links. + - Switch to debhelper 11. + - Use secure URL for upstream homepage. + * Declare compat level 11. + * Add gbp.conf. + * Update watch file. Thanks to Lev Lamberov for the patch. + (Closes: #893889) + * Declare Standards-Version: 4.1.4. (no additional changes needed) + + -- Nicholas D Steeves Sat, 02 Jun 2018 22:51:58 -0400 + yaml-mode (0.0.9-2) unstable; urgency=medium * Drop explicit dependency on emacs23 (closes: #754030) diff -Nru yaml-mode-0.0.9/debian/compat yaml-mode-0.0.13/debian/compat --- yaml-mode-0.0.9/debian/compat 2014-09-04 20:01:36.000000000 +0000 +++ yaml-mode-0.0.13/debian/compat 2018-06-03 02:51:58.000000000 +0000 @@ -1 +1 @@ -9 +11 diff -Nru yaml-mode-0.0.9/debian/control yaml-mode-0.0.13/debian/control --- yaml-mode-0.0.9/debian/control 2014-09-04 20:01:36.000000000 +0000 +++ yaml-mode-0.0.13/debian/control 2018-06-03 02:51:58.000000000 +0000 @@ -1,18 +1,34 @@ Source: yaml-mode Section: editors Priority: optional -Maintainer: Vincent Fourmond -Build-Depends: cdbs, debhelper (>= 9) -Standards-Version: 3.9.5 -Homepage: http://github.com/yoshiki/yaml-mode -Vcs-Git: git://git.debian.org/git/users/fourmond/packages/yaml-mode.git -Vcs-Browser: http://git.debian.org/?p=users/fourmond/packages/yaml-mode.git +Maintainer: Debian Emacsen team +Uploaders: Nicholas D Steeves +Build-Depends: debhelper (>= 11~) + , dh-elpa +Standards-Version: 4.1.4 +Homepage: https://github.com/yoshiki/yaml-mode +Vcs-Git: https://salsa.debian.org/emacsen-team/yaml-mode.git +Vcs-Browser: https://salsa.debian.org/emacsen-team/yaml-mode -Package: yaml-mode +Package: elpa-yaml-mode Architecture: all -Depends: emacs | emacsen, emacsen-common (>= 1.4.14), ${misc:Depends} +Depends: ${elpa:Depends} + , ${misc:Depends} +Recommends: emacs (>= 46.0) +Enhances: emacs + , emacs25 +Breaks: yaml-mode (<< 0.0.13-1) +Replaces: yaml-mode (<< 0.0.13-1) Description: emacs mode for YAML files - This package provides an emacs major mode for editing + This package provides an emacs major mode for editing files in the YAML data format. It features syntax highlighting and auto-indentation. +Package: yaml-mode +Architecture: all +Depends: ${misc:Depends}, elpa-yaml-mode +Description: transition package, yaml-mode to elpa-yaml-mode + The yaml-mode addon has been elpafied. This dummy package + helps ease the transition from yaml-mode to elpa-yaml-mode + and is safe to remove. + diff -Nru yaml-mode-0.0.9/debian/dirs yaml-mode-0.0.13/debian/dirs --- yaml-mode-0.0.9/debian/dirs 2014-09-04 20:01:36.000000000 +0000 +++ yaml-mode-0.0.13/debian/dirs 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -usr/bin -usr/sbin diff -Nru yaml-mode-0.0.9/debian/elpa-yaml-mode.elpa yaml-mode-0.0.13/debian/elpa-yaml-mode.elpa --- yaml-mode-0.0.9/debian/elpa-yaml-mode.elpa 1970-01-01 00:00:00.000000000 +0000 +++ yaml-mode-0.0.13/debian/elpa-yaml-mode.elpa 2018-06-03 02:51:58.000000000 +0000 @@ -0,0 +1 @@ +*.el diff -Nru yaml-mode-0.0.9/debian/gbp.conf yaml-mode-0.0.13/debian/gbp.conf --- yaml-mode-0.0.9/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000 +++ yaml-mode-0.0.13/debian/gbp.conf 2018-06-03 02:51:58.000000000 +0000 @@ -0,0 +1,12 @@ +[DEFAULT] +# upstream-branch = upstream +debian-branch = master +upstream-tag = v%(version)s +debian-tag = debian/%(version)s + +sign-tags = True +pristine-tar = False +pristine-tar-commit = False + +compression = xz +compression-level = 9 diff -Nru yaml-mode-0.0.9/debian/patches/0001-Drop-upstream-makefile-and-let-dh-elpa-manage-instal.patch yaml-mode-0.0.13/debian/patches/0001-Drop-upstream-makefile-and-let-dh-elpa-manage-instal.patch --- yaml-mode-0.0.9/debian/patches/0001-Drop-upstream-makefile-and-let-dh-elpa-manage-instal.patch 1970-01-01 00:00:00.000000000 +0000 +++ yaml-mode-0.0.13/debian/patches/0001-Drop-upstream-makefile-and-let-dh-elpa-manage-instal.patch 2018-06-03 02:51:58.000000000 +0000 @@ -0,0 +1,45 @@ +From: Nicholas D Steeves +Date: Mon, 7 May 2018 17:12:44 -0400 +Subject: Drop upstream makefile and let dh-elpa manage installation + +--- + Makefile | 30 ------------------------------ + 1 file changed, 30 deletions(-) + delete mode 100644 Makefile + +diff --git a/Makefile b/Makefile +deleted file mode 100644 +index 9db39d1..0000000 +--- a/Makefile ++++ /dev/null +@@ -1,30 +0,0 @@ +-VERSION=0.0.13 +-EMACS = emacs +-PREFIX = /usr/local +-INSTALLLIBDIR = $(PREFIX)/share/emacs/site-lisp +-FLAGS = -batch -L $(INSTALLLIBDIR) -q -f batch-byte-compile +-SRC = yaml-mode.el +-INSTALL = /usr/bin/install -c -m 444 +- +-all: bytecompile +- +-bytecompile: +- $(EMACS) $(FLAGS) $(SRC) +- +-install: bytecompile +- $(INSTALL) yaml-mode.elc $(INSTALLLIBDIR) +- $(INSTALL) yaml-mode.el $(INSTALLLIBDIR) +- +-uninstall: +- rm $(INSTALLLIBDIR)/yaml-mode.elc +- rm $(INSTALLLIBDIR)/yaml-mode.el +- +-tardist: +- mkdir yaml-mode-$(VERSION) +- cp yaml-mode.el Makefile README Changes yaml-mode-$(VERSION) +- tar zcvf yaml-mode-$(VERSION).tar.gz yaml-mode-$(VERSION) +- rm -fr yaml-mode-$(VERSION) +- +-clean: +- rm -fr \#*\# *.elc *~ *.tar.gz +- diff -Nru yaml-mode-0.0.9/debian/patches/series yaml-mode-0.0.13/debian/patches/series --- yaml-mode-0.0.9/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ yaml-mode-0.0.13/debian/patches/series 2018-06-03 02:51:58.000000000 +0000 @@ -0,0 +1 @@ +0001-Drop-upstream-makefile-and-let-dh-elpa-manage-instal.patch diff -Nru yaml-mode-0.0.9/debian/rules yaml-mode-0.0.13/debian/rules --- yaml-mode-0.0.9/debian/rules 2014-09-04 20:01:36.000000000 +0000 +++ yaml-mode-0.0.13/debian/rules 2018-06-03 02:51:58.000000000 +0000 @@ -1,8 +1,4 @@ #!/usr/bin/make -f - -include /usr/share/cdbs/1/rules/debhelper.mk -# include /usr/share/cdbs/1/class/makefile.mk -# Add here any variable or target overrides you need. -DESTDIR=$(CURDIR)/debian/yaml-mode -DEB_MAKE_INVOKE=$(MAKE) DESTDIR=$(DESTDIR) \ No newline at end of file +%: + dh $@ --with elpa diff -Nru yaml-mode-0.0.9/debian/watch yaml-mode-0.0.13/debian/watch --- yaml-mode-0.0.9/debian/watch 2014-09-04 20:01:36.000000000 +0000 +++ yaml-mode-0.0.13/debian/watch 2018-06-03 02:51:58.000000000 +0000 @@ -1,5 +1,4 @@ -version=3 -https://github.com/yoshiki/yaml-mode/tags .*release-(.*)\.tar\.gz - - - +version=4 + opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%yaml-mode-$1.tar.gz%" \ + https://github.com/yoshiki/yaml-mode/tags \ + (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian uupdate diff -Nru yaml-mode-0.0.9/debian/yaml-mode.dirs yaml-mode-0.0.13/debian/yaml-mode.dirs --- yaml-mode-0.0.9/debian/yaml-mode.dirs 2014-09-04 20:01:36.000000000 +0000 +++ yaml-mode-0.0.13/debian/yaml-mode.dirs 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/share/emacs/site-lisp/yaml-mode diff -Nru yaml-mode-0.0.9/debian/yaml-mode.emacsen-install yaml-mode-0.0.13/debian/yaml-mode.emacsen-install --- yaml-mode-0.0.9/debian/yaml-mode.emacsen-install 2014-09-04 20:01:36.000000000 +0000 +++ yaml-mode-0.0.13/debian/yaml-mode.emacsen-install 1970-01-01 00:00:00.000000000 +0000 @@ -1,46 +0,0 @@ -#! /bin/sh -e -# /usr/lib/emacsen-common/packages/install/yaml-mode - -# Written by Jim Van Zandt , borrowing heavily -# from the install scripts for gettext by Santiago Vila -# and octave by Dirk Eddelbuettel . -# -# Slightly modified by Vincent Fourmond - -FLAVOR=$1 -PACKAGE=yaml-mode - -if [ ${FLAVOR} = emacs ]; then exit 0; fi - -echo install/${PACKAGE}: Handling install for emacsen flavor ${FLAVOR} - -FLAGS="${SITEFLAG} -q -batch -l path.el -f batch-byte-compile" - -ELDIR=/usr/share/emacs/site-lisp/${PACKAGE} -ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE} - -# Install-info-altdir does not actually exist. -# Maybe somebody will write it. -if test -x /usr/sbin/install-info-altdir; then - echo install/${PACKAGE}: install Info links for ${FLAVOR} - install-info-altdir --quiet --section "" "" --dirname=${FLAVOR} /usr/info/${PACKAGE}.info.gz -fi - -install -m 755 -d ${ELCDIR} -cd ${ELDIR} -FILES=`echo *.el` -cd ${ELCDIR} -# Temporarily symlink files for byte-compilation. -for file in ${FILES}; do - rm -f ${file} # Remove all files that could have - # been left here before. - ln -s ../../../emacs/site-lisp/${PACKAGE}/${file} . -done - -cat << EOF > path.el -(setq load-path (cons "." load-path) byte-compile-warnings nil) -EOF -${FLAVOR} ${FLAGS} ${FILES} -rm -f path.el - -exit 0 diff -Nru yaml-mode-0.0.9/debian/yaml-mode.emacsen-remove yaml-mode-0.0.13/debian/yaml-mode.emacsen-remove --- yaml-mode-0.0.9/debian/yaml-mode.emacsen-remove 2014-09-04 20:01:36.000000000 +0000 +++ yaml-mode-0.0.13/debian/yaml-mode.emacsen-remove 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -#!/bin/sh -e -# /usr/lib/emacsen-common/packages/remove/yaml-mode - -FLAVOR=$1 -PACKAGE=yaml-mode - -if [ ${FLAVOR} != emacs ]; then - if test -x /usr/sbin/install-info-altdir; then - echo remove/${PACKAGE}: removing Info links for ${FLAVOR} - install-info-altdir --quiet --remove --dirname=${FLAVOR} /usr/info/yaml-mode.info.gz - fi - - echo remove/${PACKAGE}: purging byte-compiled files for ${FLAVOR} - rm -rf /usr/share/${FLAVOR}/site-lisp/${PACKAGE} -fi diff -Nru yaml-mode-0.0.9/debian/yaml-mode.emacsen-startup yaml-mode-0.0.13/debian/yaml-mode.emacsen-startup --- yaml-mode-0.0.9/debian/yaml-mode.emacsen-startup 2014-09-04 20:01:36.000000000 +0000 +++ yaml-mode-0.0.13/debian/yaml-mode.emacsen-startup 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ -;; -*-emacs-lisp-*- -;; -;; Emacs startup file, e.g. /etc/emacs/site-start.d/50yaml-mode.el -;; for the Debian yaml-mode package -;; -;; Originally contributed by Nils Naumann -;; Modified by Dirk Eddelbuettel -;; Adapted for dh-make by Jim Van Zandt - -;; The yaml-mode package follows the Debian/GNU Linux 'emacsen' policy and -;; byte-compiles its elisp files for each 'emacs flavor' (emacs19, -;; xemacs19, emacs20, xemacs20...). The compiled code is then -;; installed in a subdirectory of the respective site-lisp directory. -;; We have to add this to the load-path: -(let ((package-dir (concat "/usr/share/" - (symbol-name flavor) - "/site-lisp/yaml-mode"))) -;; If package-dir does not exist, the yaml-mode package must have -;; removed but not purged, and we should skip the setup. - (when (file-directory-p package-dir) - ;; Use debian-pkg-add-load-path-item per §9 of debian emacs subpolicy - (debian-pkg-add-load-path-item package-dir ) - (autoload 'yaml-mode "yaml-mode" - "Major mode for editing yaml-mode files." t) - (add-to-list 'auto-mode-alist '("\\.yaml\\'" . yaml-mode)) - (add-to-list 'auto-mode-alist '("\\.yml\\'" . yaml-mode)) - )) - diff -Nru yaml-mode-0.0.9/debian/yaml-mode.install yaml-mode-0.0.13/debian/yaml-mode.install --- yaml-mode-0.0.9/debian/yaml-mode.install 2014-09-04 20:01:36.000000000 +0000 +++ yaml-mode-0.0.13/debian/yaml-mode.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -yaml-mode.el usr/share/emacs/site-lisp/yaml-mode diff -Nru yaml-mode-0.0.9/LICENSE.txt yaml-mode-0.0.13/LICENSE.txt --- yaml-mode-0.0.9/LICENSE.txt 1970-01-01 00:00:00.000000000 +0000 +++ yaml-mode-0.0.13/LICENSE.txt 2016-11-04 21:25:25.000000000 +0000 @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + 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, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff -Nru yaml-mode-0.0.9/Makefile yaml-mode-0.0.13/Makefile --- yaml-mode-0.0.9/Makefile 2013-03-11 03:47:12.000000000 +0000 +++ yaml-mode-0.0.13/Makefile 2016-11-04 21:25:25.000000000 +0000 @@ -1,4 +1,4 @@ -VERSION=0.0.9 +VERSION=0.0.13 EMACS = emacs PREFIX = /usr/local INSTALLLIBDIR = $(PREFIX)/share/emacs/site-lisp diff -Nru yaml-mode-0.0.9/README yaml-mode-0.0.13/README --- yaml-mode-0.0.9/README 2013-03-11 03:47:12.000000000 +0000 +++ yaml-mode-0.0.13/README 2016-11-04 21:25:25.000000000 +0000 @@ -1,13 +1,22 @@ +RECRUITMENTS + I have not used emacs and this library for a long time, + so I recruit maintainers or collaborators for all yaml-mode users. + If you are interested in maintaining or collaborating with this library, + please contact me. + NAME yaml-mode - Simple major mode to edit YAML file for emacs +REQUIREMENTS + Emacs 24.1 + SYNOPSIS To install, just drop this file into a directory in your `load-path' and (optionally) byte-compile it. To automatically handle files ending in '.yml', add something like: (require 'yaml-mode) - (add-to-list 'auto-mode-alist '("\\.yml$" . yaml-mode)) + (add-to-list 'auto-mode-alist '("\\.yml\\'" . yaml-mode)) to your .emacs file. diff -Nru yaml-mode-0.0.9/test-files/allow-spaces-before-dash-1.yaml yaml-mode-0.0.13/test-files/allow-spaces-before-dash-1.yaml --- yaml-mode-0.0.9/test-files/allow-spaces-before-dash-1.yaml 1970-01-01 00:00:00.000000000 +0000 +++ yaml-mode-0.0.13/test-files/allow-spaces-before-dash-1.yaml 2016-11-04 21:25:25.000000000 +0000 @@ -0,0 +1,18 @@ + +## Old behaviour (v0.0.12) +## +## (1) open this file +## +## (2) move to the line containing l1 +## +## (3) Press TAB. First character of l1 should now be below '|', but +## it is below the dash +## +## New behaviour: +## +## (1) When l1 is unindented, pressing TAB indents it to start below '|' +## +## +- bb: + - | +l1 diff -Nru yaml-mode-0.0.9/test-files/allow-spaces-before-dash-2.yaml yaml-mode-0.0.13/test-files/allow-spaces-before-dash-2.yaml --- yaml-mode-0.0.9/test-files/allow-spaces-before-dash-2.yaml 1970-01-01 00:00:00.000000000 +0000 +++ yaml-mode-0.0.13/test-files/allow-spaces-before-dash-2.yaml 2016-11-04 21:25:25.000000000 +0000 @@ -0,0 +1,7 @@ +# For comparison: this is handled correctly in v0.0.12 +# +# (1) Move to line containing l3 +# (2) TAB indents l3 by 2 spaces to start below '|' +# +- | +l3 diff -Nru yaml-mode-0.0.9/test-files/allow-spaces-before-dash-3.yaml yaml-mode-0.0.13/test-files/allow-spaces-before-dash-3.yaml --- yaml-mode-0.0.9/test-files/allow-spaces-before-dash-3.yaml 1970-01-01 00:00:00.000000000 +0000 +++ yaml-mode-0.0.13/test-files/allow-spaces-before-dash-3.yaml 2016-11-04 21:25:25.000000000 +0000 @@ -0,0 +1,7 @@ +# For comparison: this is handled correctly in v0.0.12 +# +# (1) Move to line containing l4 +# (2) Pressing TAB indents l4 by 2 spaces to starts below ':' +# +xy: | +l4 diff -Nru yaml-mode-0.0.9/test-files/test-dash-newline-starts-sequence-1.yaml yaml-mode-0.0.13/test-files/test-dash-newline-starts-sequence-1.yaml --- yaml-mode-0.0.9/test-files/test-dash-newline-starts-sequence-1.yaml 1970-01-01 00:00:00.000000000 +0000 +++ yaml-mode-0.0.13/test-files/test-dash-newline-starts-sequence-1.yaml 2016-11-04 21:25:25.000000000 +0000 @@ -0,0 +1,23 @@ +# +# Old behaviour (version 0.0.12) +# +# (1) Move to cursor to the beginning of the line containing 'aaa' +# (2) Press TAB +# (3) The line should be indented now. +# Problem: the line is not indented. +# +# Note: in the line containing the dash ('-') there is no space character +# after the dash, so it is not recognized as start of the sequence entry +# by yaml-nested-sequence-re +# +# Proposed change: +# +# Change yaml-bare-scalar-re to recognize the dash-newline sequence. +# +# New behaviour: +# +# (1) Pressing TAB on the line containing 'aaa' now indents the line. +# (2) Pressing TAB again unindents the line. +# +- +aaa diff -Nru yaml-mode-0.0.9/test-files/test-dash-newline-starts-sequence-2.yaml yaml-mode-0.0.13/test-files/test-dash-newline-starts-sequence-2.yaml --- yaml-mode-0.0.9/test-files/test-dash-newline-starts-sequence-2.yaml 1970-01-01 00:00:00.000000000 +0000 +++ yaml-mode-0.0.13/test-files/test-dash-newline-starts-sequence-2.yaml 2016-11-04 21:25:25.000000000 +0000 @@ -0,0 +1,33 @@ +# +# Old behaviour (version 0.0.12) +# +# (1) Move to cursor to the beginning of the line containing 'aaa' +# (2) Press TAB repeatedly +# +# (3) The cycle of indentations of the line should include +# the 'indented more than the previous line' state +# +# Problem: the line is only indented to align with +# the dash in then previous line, but not more. +# +# Note: in the line containing the dash ('-') there is no space character +# after the dash, so it is not recognized as start of the sequence entry +# by yaml-nested-sequence-re +# +# Proposed change: +# +# Change yaml-bare-scalar-re to recognize the dash-newline sequence. +# +# New behaviour: +# +# (1) Pressing TAB on the line containing 'aaa' +# now indents the line more than the previous line. +# +# (2) Pressing TAB again indents the line +# to align with dash on the previous line. +# +# (3) Pressing TAB again unindents the line. +# +- + - + aaa diff -Nru yaml-mode-0.0.9/yaml-mode.el yaml-mode-0.0.13/yaml-mode.el --- yaml-mode-0.0.9/yaml-mode.el 2013-03-11 03:47:12.000000000 +0000 +++ yaml-mode-0.0.13/yaml-mode.el 2016-11-04 21:25:25.000000000 +0000 @@ -1,11 +1,13 @@ ;;; yaml-mode.el --- Major mode for editing YAML files -;; Copyright (C) 2010 Yoshiki Kurihara +;; Copyright (C) 2010-2014 Yoshiki Kurihara -;; Author: Yoshiki Kurihara +;; Author: Yoshiki Kurihara ;; Marshall T. Vandegrift +;; Maintainer: Vasilij Schneidermann +;; Package-Requires: ((emacs "24.1")) ;; Keywords: data yaml -;; Version: 0.0.9 +;; Version: 0.0.13 ;; This file is not part of Emacs @@ -19,10 +21,9 @@ ;; 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 GNU Emacs; see the file COPYING. If not, write to -;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; You should have received a copy of the GNU General Public License along +;; with this program; if not, write to the Free Software Foundation, Inc., +;; 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ;;; Commentary: @@ -40,7 +41,7 @@ ;; handle files ending in '.yml', add something like: ;; ;; (require 'yaml-mode) -;; (add-to-list 'auto-mode-alist '("\\.yml$" . yaml-mode)) +;; (add-to-list 'auto-mode-alist '("\\.yml\\'" . yaml-mode)) ;; ;; to your .emacs file. ;; @@ -77,6 +78,7 @@ (defcustom yaml-indent-offset 2 "*Amount of offset per level of indentation." :type 'integer + :safe 'natnump :group 'yaml) (defcustom yaml-backspace-function 'backward-delete-char-untabify @@ -115,14 +117,11 @@ ;; Constants -(defconst yaml-mode-version "0.0.9" "Version of `yaml-mode'.") +(defconst yaml-mode-version "0.0.12" "Version of `yaml-mode'.") (defconst yaml-blank-line-re "^ *$" "Regexp matching a line containing only (valid) whitespace.") -(defconst yaml-comment-re "\\(?:^\\|\\s-+\\)\\(#.*\\)" - "Regexp matching a line containing a YAML comment or delimiter.") - (defconst yaml-directive-re "^\\(?:--- \\)? *%\\(\\w+\\)" "Regexp matching a line contatining a YAML directive.") @@ -147,9 +146,9 @@ "Regexp matching a single YAML hash key.") (defconst yaml-scalar-context-re - (concat "\\(?:^\\(?:--- \\)?\\|{\\|\\(?:[-,] +\\)+\\) *" + (concat "\\(?:^\\(?:--- \\)?\\|{\\|\\(?: *[-,] +\\)+\\) *" "\\(?:" yaml-bare-scalar-re " *: \\)?") - "Regexp indicating the begininng of a scalar context.") + "Regexp indicating the beginning of a scalar context.") (defconst yaml-nested-map-re (concat ".*: *\\(?:&.*\\|{ *\\|" yaml-tag-re " *\\)?$") @@ -165,7 +164,7 @@ "Regexp matching a line beginning a YAML block literal.") (defconst yaml-nested-sequence-re - (concat "^\\(?: *- +\\)+" + (concat "^\\(?:\\(?: *- +\\)+\\|\\(:? *-$\\)\\)" "\\(?:" yaml-bare-scalar-re " *:\\(?: +.*\\)?\\)?$") "Regexp matching a line containing one or more nested YAML sequences.") @@ -185,71 +184,76 @@ ;; Mode setup -(defvar yaml-mode-map () +(defvar yaml-mode-map + (let ((map (make-sparse-keymap))) + (define-key map "|" 'yaml-electric-bar-and-angle) + (define-key map ">" 'yaml-electric-bar-and-angle) + (define-key map "-" 'yaml-electric-dash-and-dot) + (define-key map "." 'yaml-electric-dash-and-dot) + (define-key map (kbd "DEL") 'yaml-electric-backspace) + map) "Keymap used in `yaml-mode' buffers.") -(if yaml-mode-map - nil - (setq yaml-mode-map (make-sparse-keymap)) - (define-key yaml-mode-map "|" 'yaml-electric-bar-and-angle) - (define-key yaml-mode-map ">" 'yaml-electric-bar-and-angle) - (define-key yaml-mode-map "-" 'yaml-electric-dash-and-dot) - (define-key yaml-mode-map "." 'yaml-electric-dash-and-dot) - (define-key yaml-mode-map [backspace] 'yaml-electric-backspace) - (define-key yaml-mode-map "\C-j" 'newline-and-indent)) -(defvar yaml-mode-syntax-table nil +(defvar yaml-mode-syntax-table + (let ((syntax-table (make-syntax-table))) + (modify-syntax-entry ?\' "\"" syntax-table) + (modify-syntax-entry ?\" "\"" syntax-table) + (modify-syntax-entry ?# "<" syntax-table) + (modify-syntax-entry ?\n ">" syntax-table) + (modify-syntax-entry ?\\ "\\" syntax-table) + (modify-syntax-entry ?- "_" syntax-table) + (modify-syntax-entry ?_ "_" syntax-table) + (modify-syntax-entry ?\( "." syntax-table) + (modify-syntax-entry ?\) "." syntax-table) + (modify-syntax-entry ?\{ "(}" syntax-table) + (modify-syntax-entry ?\} "){" syntax-table) + (modify-syntax-entry ?\[ "(]" syntax-table) + (modify-syntax-entry ?\] ")[" syntax-table) + syntax-table) "Syntax table in use in `yaml-mode' buffers.") -(if yaml-mode-syntax-table - nil - (setq yaml-mode-syntax-table (make-syntax-table)) - (modify-syntax-entry ?\' "\"" yaml-mode-syntax-table) - (modify-syntax-entry ?\" "\"" yaml-mode-syntax-table) - (modify-syntax-entry ?# "<" yaml-mode-syntax-table) - (modify-syntax-entry ?\n ">" yaml-mode-syntax-table) - (modify-syntax-entry ?\\ "\\" yaml-mode-syntax-table) - (modify-syntax-entry ?- "w" yaml-mode-syntax-table) - (modify-syntax-entry ?_ "_" yaml-mode-syntax-table) - (modify-syntax-entry ?\( "." yaml-mode-syntax-table) - (modify-syntax-entry ?\) "." yaml-mode-syntax-table) - (modify-syntax-entry ?\{ "(}" yaml-mode-syntax-table) - (modify-syntax-entry ?\} "){" yaml-mode-syntax-table) - (modify-syntax-entry ?\[ "(]" yaml-mode-syntax-table) - (modify-syntax-entry ?\] ")[" yaml-mode-syntax-table)) ;;;###autoload -(define-derived-mode yaml-mode fundamental-mode "YAML" +(define-derived-mode yaml-mode text-mode "YAML" "Simple mode to edit YAML. \\{yaml-mode-map}" + :syntax-table yaml-mode-syntax-table (set (make-local-variable 'comment-start) "# ") (set (make-local-variable 'comment-start-skip) "#+ *") (set (make-local-variable 'indent-line-function) 'yaml-indent-line) (set (make-local-variable 'indent-tabs-mode) nil) - (set (make-local-variable 'font-lock-defaults) - '(yaml-font-lock-keywords - nil nil nil nil - (font-lock-syntactic-keywords . yaml-font-lock-syntactic-keywords)))) + (set (make-local-variable 'fill-paragraph-function) 'yaml-fill-paragraph) + + (set (make-local-variable 'syntax-propertize-function) + 'yaml-mode-syntax-propertize-function) + (setq font-lock-defaults '(yaml-font-lock-keywords))) ;; Font-lock support (defvar yaml-font-lock-keywords - (list - (cons yaml-comment-re '(1 font-lock-comment-face)) - (cons yaml-constant-scalars-re '(1 font-lock-constant-face)) - (cons yaml-tag-re '(0 font-lock-type-face)) - (cons yaml-node-anchor-alias-re '(0 font-lock-function-name-face t)) - (cons yaml-hash-key-re '(1 font-lock-variable-name-face t)) - (cons yaml-document-delimiter-re '(0 font-lock-comment-face)) - (cons yaml-directive-re '(1 font-lock-builtin-face)) - '(yaml-font-lock-block-literals 0 font-lock-string-face t) - '("^[\t]+" 0 'yaml-tab-face t)) + `((,yaml-constant-scalars-re . (1 font-lock-constant-face)) + (,yaml-tag-re . (0 font-lock-type-face)) + (,yaml-node-anchor-alias-re . (0 font-lock-function-name-face)) + (,yaml-hash-key-re . (1 font-lock-variable-name-face)) + (,yaml-document-delimiter-re . (0 font-lock-comment-face)) + (,yaml-directive-re . (1 font-lock-builtin-face)) + (yaml-font-lock-block-literals 0 font-lock-string-face) + ("^[\t]+" 0 'yaml-tab-face t)) "Additional expressions to highlight in YAML mode.") -(defvar yaml-font-lock-syntactic-keywords - (list '(yaml-syntactic-block-literals 0 "." t)) - "Additional syntax features to highlight in YAML mode.") - +(defun yaml-mode-syntax-propertize-function (beg end) + "Unhighlight foo#bar tokens between BEG and END." + (save-excursion + (goto-char beg) + (while (search-forward "#" end t) + (save-excursion + (forward-char -1) + ;; both ^# and [ \t]# are comments + (when (and (not (bolp)) + (not (memq (preceding-char) '(?\s ?\t)))) + (put-text-property (point) (1+ (point)) + 'syntax-table (string-to-syntax "_"))))))) (defun yaml-font-lock-block-literals (bound) "Find lines within block literals. @@ -290,26 +294,6 @@ bound t)) (set-match-data (nthcdr 2 (match-data))) t)))))) -(defun yaml-syntactic-block-literals (bound) - "Find quote characters within block literals. -Finds the first quote character within a block literal (if any) after -point and prior to BOUND. Returns the position of the quote character -in the match data, as consumed by matcher functions in -`font-lock-syntactic-keywords'. This allows the mode to treat ['\"] -characters in block literals as punctuation syntax instead of string -syntax, preventing unmatched quotes in block literals from painting -the entire buffer in `font-lock-string-face'." - (let ((found nil)) - (while (and (not found) - (/= (point) bound) - (yaml-font-lock-block-literals bound)) - (let ((begin (match-beginning 0)) (end (match-end 0))) - (goto-char begin) - (cond - ((re-search-forward "['\"]" end t) (setq found t)) - ((goto-char end))))) - found)) - ;; Indentation and electric keys @@ -391,6 +375,46 @@ (if (and (not arg) (looking-at yaml-document-delimiter-re)) (delete-horizontal-space)))) +(defun yaml-narrow-to-block-literal () + "Narrow the buffer to block literal if the point is in it, +otherwise do nothing." + (interactive) + (save-excursion + (goto-char (point-at-bol)) + (while (and (looking-at-p yaml-blank-line-re) (not (bobp))) + (forward-line -1)) + (let ((nlines yaml-block-literal-search-lines) + (min-level (current-indentation)) + beg) + (forward-line -1) + (while (and (/= nlines 0) + (/= min-level 0) + (not (looking-at-p yaml-block-literal-re)) + (not (bobp))) + (set 'nlines (1- nlines)) + (unless (looking-at-p yaml-blank-line-re) + (set 'min-level (min min-level (current-indentation)))) + (forward-line -1)) + (when (and (< (current-indentation) min-level) + (looking-at-p yaml-block-literal-re)) + (set 'min-level (current-indentation)) + (forward-line) + (setq beg (point)) + (while (and (not (eobp)) + (or (looking-at-p yaml-blank-line-re) + (> (current-indentation) min-level))) + (forward-line)) + (narrow-to-region beg (point)))))) + +(defun yaml-fill-paragraph (&optional justify region) + "Fill paragraph. +This behaves as `fill-paragraph' except that filling does not +cross boundaries of block literals." + (interactive "*P") + (save-restriction + (yaml-narrow-to-block-literal) + (let ((fill-paragraph-function nil)) + (fill-paragraph justify region)))) (defun yaml-set-imenu-generic-expression () (make-local-variable 'imenu-generic-expression) @@ -408,7 +432,7 @@ yaml-mode-version) ;;;###autoload -(add-to-list 'auto-mode-alist '("\\.ya?ml$" . yaml-mode)) +(add-to-list 'auto-mode-alist '("\\.\\(e?ya?\\|ra\\)ml\\'" . yaml-mode)) (provide 'yaml-mode)