diff -Nru sml-mode-6.8/debian/changelog sml-mode-6.9/debian/changelog --- sml-mode-6.8/debian/changelog 2017-12-21 15:31:13.000000000 +0000 +++ sml-mode-6.9/debian/changelog 2018-10-10 12:02:03.000000000 +0000 @@ -1,3 +1,12 @@ +sml-mode (6.9-1) unstable; urgency=medium + + * new upstream version + * bump standards version + * swizzle packaging repo to salsa + * dh11 + + -- Barak A. Pearlmutter Wed, 10 Oct 2018 13:02:03 +0100 + sml-mode (6.8-1) unstable; urgency=medium * new upstream version diff -Nru sml-mode-6.8/debian/compat sml-mode-6.9/debian/compat --- sml-mode-6.8/debian/compat 2017-12-21 15:25:02.000000000 +0000 +++ sml-mode-6.9/debian/compat 2018-10-10 11:57:35.000000000 +0000 @@ -1 +1 @@ -10 +11 diff -Nru sml-mode-6.8/debian/control sml-mode-6.9/debian/control --- sml-mode-6.8/debian/control 2017-12-21 15:31:13.000000000 +0000 +++ sml-mode-6.9/debian/control 2018-10-10 12:00:54.000000000 +0000 @@ -3,11 +3,11 @@ Priority: optional Maintainer: Debian Emacs addons team Uploaders: Barak A. Pearlmutter -Build-Depends: debhelper (>= 10), dh-elpa (>= 0.0.17), texinfo -Standards-Version: 4.1.2 +Build-Depends: debhelper (>= 11), dh-elpa (>= 0.0.17), texinfo +Standards-Version: 4.2.1 Homepage: https://elpa.gnu.org/packages/sml-mode.html -Vcs-Git: https://anonscm.debian.org/git/pkg-emacsen/pkg/sml-mode.git -Vcs-Browser: https://anonscm.debian.org/gitweb/?p=pkg-emacsen/pkg/sml-mode.git +Vcs-Git: https://salsa.debian.org/emacsen-team/sml-mode.git +Vcs-Browser: https://salsa.debian.org/emacsen-team/sml-mode Package: elpa-sml-mode Architecture: all diff -Nru sml-mode-6.8/debian/patches/debian-changes sml-mode-6.9/debian/patches/debian-changes --- sml-mode-6.8/debian/patches/debian-changes 2017-12-21 15:31:13.000000000 +0000 +++ sml-mode-6.9/debian/patches/debian-changes 1970-01-01 00:00:00.000000000 +0000 @@ -1,149 +0,0 @@ -Description: - TODO: Put a short summary on the line above and replace this paragraph - with a longer explanation of this change. Complete the meta-information - with other relevant fields (see below for details). To make it easier, the - information below has been extracted from the changelog. Adjust it or drop - it. - . - sml-mode (6.8-1) unstable; urgency=medium - . - * new upstream version - * update homepage in debian/control - * bump standards version -Author: Barak A. Pearlmutter - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: , -Bug: -Bug-Debian: https://bugs.debian.org/ -Bug-Ubuntu: https://launchpad.net/bugs/ -Forwarded: -Reviewed-By: -Last-Update: 2017-12-22 - ---- sml-mode-6.8.orig/sml-mode.el -+++ sml-mode-6.8/sml-mode.el -@@ -1831,6 +1831,119 @@ If nil, align it with previous cases." - (set (make-local-variable 'font-lock-defaults) sml-yacc-font-lock-defaults)) - - -+ -+;;;; ChangeLog: -+ -+;; 2017-12-12 Stefan Monnier -+;; -+;; Bump version to make new release -+;; -+;; 2016-10-26 Stefan Monnier -+;; -+;; * packages/sml-mode/sml-mode.el (sml-smie-rules): Remove incoherent -+;; rule. -+;; -+;; 2016-08-14 Stefan Monnier -+;; -+;; * packages/sml-mode/sml-mode.el (sml-tyvarseq-re): Backtrack less -+;; (bug#24205) -+;; -+;; 2016-08-04 Stefan Monnier -+;; -+;; * sml-mode/sml-mode.el: Use cl-lib. -+;; -+;; 2016-07-11 Paul Eggert -+;; -+;; Fix some quoting problems in doc strings -+;; -+;; Most of these are minor issues involving, e.g., quoting `like this' -+;; instead of 'like this'. A few involve escaping ` and ' with a preceding -+;; \= when the characters should not be turned into curved single quotes. -+;; -+;; 2015-02-12 Stefan Monnier -+;; -+;; * sml-mode/sml-mode.el: Bump version to make a new release -+;; -+;; 2015-02-12 Stefan Monnier -+;; -+;; * sml-mode/sml-mode.el (sml-smie-rules): Work around Emacs-24.3 bug. -+;; -+;; 2015-02-09 Stefan Monnier -+;; -+;; * sml-mode.el: Add prettify-symbols-mode and Poly/ML support -+;; -+;; (sml-font-lock-symbols): Mark obsolete. -+;; (sml-font-lock-compose-symbol): Use symbol-boundaries rather -+;; word-boundaries. -+;; (sml-smie-rules): Tweak indentation after "fun". -+;; (sml-smie-definitional-equal-p): Handle ":>". -+;; (sml-prog-proc-send-string): Try and avoid mixing prompt/userinput and -+;; process output on the same line. -+;; (sml-error-regexp-alist): Add Poly/ML support. -+;; (sml-mode): Add prettify-symbols-mode support. -+;; -+;; 2014-10-15 Stefan Monnier -+;; -+;; * packages/sml-mode/sml-mode.el (sml-smie-grammar): Add "withtype". -+;; (sml-smie-rules): Use pcase. -+;; (sml-smie-non-nested-of-p): Rewrite to avoid regexp and stay closer to -+;; point. -+;; -+;; 2014-06-17 Stefan Monnier -+;; -+;; * sml-mode/sml-mode.el: Release new version. -+;; -+;; 2014-06-04 Stefan Monnier -+;; -+;; * sml-mode.el (sml--rightalign-and-p): New function. -+;; -+;; 2014-06-03 Stefan Monnier -+;; -+;; * sml-mode/sml-mode.el (sml-smie-grammar): Add include&sharing. -+;; (sml-smie-rules): Add functor rule. -+;; (sml-smie-definitional-equal-p): Use smie-backward-sexp. -+;; -+;; 2013-12-27 Stefan Monnier -+;; -+;; * sml-mode.el (sml-smie-rules): Adjust for new :close-all rule. -+;; -+;; 2013-03-03 Stefan Monnier -+;; -+;; * packages/sml-mode/sml-mode.el (sml-imenu-regexp): Make it a const. -+;; (sml-imenu-create-index): Don't assume we'll find an = after structure. -+;; -+;; 2013-01-24 Stefan Monnier -+;; -+;; * sml-mode: Release 6.3, bugfixes -+;; -+;; 2013-01-24 Stefan Monnier -+;; -+;; * sml-mode.el (sml-mode-variables): Set sml-prog-proc-descriptor here... -+;; (sml-mode): ... instead of here. -+;; -+;; 2013-01-24 Stefan Monnier -+;; -+;; * sml-mode.el (inferior-sml-mode): Fix comint-completion-addsuffix. -+;; -+;; 2012-12-04 Stefan Monnier -+;; -+;; * packages/sml-mode/sml-mode.el (sml-mode-map): Add back C-c C-s -+;; binding. -+;; (sml-prog-proc-switch-to): Add missing interactive spec. -+;; -+;; 2012-10-31 Stefan Monnier -+;; -+;; * sml-mode.el: Integrate BUGS&NEWS; re-add run-sml. -+;; -+;; 2012-10-22 Stefan Monnier -+;; -+;; Add SML-mode. -+;; -+;; git-subtree-dir: packages/sml-mode git-subtree-mainline: -+;; a50c62a632aa422957a0e4224d5c6e4c2366156b git-subtree-split: -+;; d2ef91a138487b521bb7e08722b8d122aa757b5a -+;; -+ - (provide 'sml-mode) - - ;;; sml-mode.el ends here diff -Nru sml-mode-6.8/debian/patches/series sml-mode-6.9/debian/patches/series --- sml-mode-6.8/debian/patches/series 2017-12-21 15:31:13.000000000 +0000 +++ sml-mode-6.9/debian/patches/series 2018-10-10 11:57:35.000000000 +0000 @@ -1,4 +1,3 @@ 0001-texi-build-errors.patch 0002-require-third-arg.patch 0003-safe-local-variable.patch -debian-changes diff -Nru sml-mode-6.8/sml-mode.el sml-mode-6.9/sml-mode.el --- sml-mode-6.8/sml-mode.el 2017-12-21 15:24:38.000000000 +0000 +++ sml-mode-6.9/sml-mode.el 2018-10-10 11:54:35.000000000 +0000 @@ -1,9 +1,9 @@ ;;; sml-mode.el --- Major mode for editing (Standard) ML -*- lexical-binding: t; coding: utf-8 -*- -;; Copyright (C) 1989,1999,2000,2004,2007,2010-2017 Free Software Foundation, Inc. +;; Copyright (C) 1989,1999,2000,2004,2007,2010-2018 Free Software Foundation, Inc. ;; Maintainer: Stefan Monnier -;; Version: 6.8 +;; Version: 6.9 ;; Keywords: SML ;; Author: Lars Bo Nielsen ;; Olin Shivers @@ -51,6 +51,11 @@ ;;;; News: +;;;;; Changes since 6.8: + +;; - new var sml-abbrev-skeletons to control whether to include skeletons +;; in the main abbrev table. + ;;;;; Changes since 5.0: ;; - sml-electric-pipe-mode to make the | key electric. @@ -1252,6 +1257,20 @@ (defvar comment-quote-nested) +(defcustom sml-abbrev-skeletons t + "Whether to include skeletons in `sml-mode's abbrev table." + :type 'boolean) + +(define-abbrev-table 'sml-skel-abbrev-table nil + "Abbrev table for skeletons in `sml-mode.'" + :case-fixed t + :enable-function + (lambda () (and sml-abbrev-skeletons (not (nth 8 (syntax-ppss)))))) + +(define-abbrev-table 'sml-mode-abbrev-table nil + "Abbrevs for `sml-mode.'" + :parents (list sml-skel-abbrev-table)) + ;;;###autoload (define-derived-mode sml-mode sml-prog-proc-mode "SML" "\\Major mode for editing Standard ML code. @@ -1484,20 +1503,16 @@ signature, structure, and functor by default.") (defmacro sml-def-skeleton (name interactor &rest elements) + (declare (indent 2)) (let ((fsym (intern (concat "sml-form-" name)))) `(progn (add-to-list 'sml-forms-alist ',(cons name fsym)) - (define-abbrev sml-mode-abbrev-table ,name "" ',fsym nil 'system) - (let ((abbrev (abbrev-symbol ,name sml-mode-abbrev-table))) - (abbrev-put abbrev :case-fixed t) - (abbrev-put abbrev :enable-function - (lambda () (not (nth 8 (syntax-ppss)))))) + (define-abbrev sml-skel-abbrev-table ,name "" ',fsym :system t) (define-skeleton ,fsym ,(format "SML-mode skeleton for `%s..' expressions" name) ,interactor ,(concat name " ") > ,@elements)))) -(put 'sml-def-skeleton 'lisp-indent-function 2) (sml-def-skeleton "let" nil @ "\nin " > _ "\nend" >) @@ -1830,6 +1845,123 @@ (set (make-local-variable 'font-lock-defaults) sml-yacc-font-lock-defaults)) + +;;;; ChangeLog: + +;; 2018-10-08 Stefan Monnier +;; +;; * sml-mode.el: New var sml-abbrev-skeletons; bump vers to 6.9 +;; +;; 2017-12-12 Stefan Monnier +;; +;; Bump version to make new release +;; +;; 2016-10-26 Stefan Monnier +;; +;; * packages/sml-mode/sml-mode.el (sml-smie-rules): Remove incoherent +;; rule. +;; +;; 2016-08-14 Stefan Monnier +;; +;; * packages/sml-mode/sml-mode.el (sml-tyvarseq-re): Backtrack less +;; (bug#24205) +;; +;; 2016-08-04 Stefan Monnier +;; +;; * sml-mode/sml-mode.el: Use cl-lib. +;; +;; 2016-07-11 Paul Eggert +;; +;; Fix some quoting problems in doc strings +;; +;; Most of these are minor issues involving, e.g., quoting `like this' +;; instead of 'like this'. A few involve escaping ` and ' with a preceding +;; \= when the characters should not be turned into curved single quotes. +;; +;; 2015-02-12 Stefan Monnier +;; +;; * sml-mode/sml-mode.el: Bump version to make a new release +;; +;; 2015-02-12 Stefan Monnier +;; +;; * sml-mode/sml-mode.el (sml-smie-rules): Work around Emacs-24.3 bug. +;; +;; 2015-02-09 Stefan Monnier +;; +;; * sml-mode.el: Add prettify-symbols-mode and Poly/ML support +;; +;; (sml-font-lock-symbols): Mark obsolete. +;; (sml-font-lock-compose-symbol): Use symbol-boundaries rather +;; word-boundaries. +;; (sml-smie-rules): Tweak indentation after "fun". +;; (sml-smie-definitional-equal-p): Handle ":>". +;; (sml-prog-proc-send-string): Try and avoid mixing prompt/userinput and +;; process output on the same line. +;; (sml-error-regexp-alist): Add Poly/ML support. +;; (sml-mode): Add prettify-symbols-mode support. +;; +;; 2014-10-15 Stefan Monnier +;; +;; * packages/sml-mode/sml-mode.el (sml-smie-grammar): Add "withtype". +;; (sml-smie-rules): Use pcase. +;; (sml-smie-non-nested-of-p): Rewrite to avoid regexp and stay closer to +;; point. +;; +;; 2014-06-17 Stefan Monnier +;; +;; * sml-mode/sml-mode.el: Release new version. +;; +;; 2014-06-04 Stefan Monnier +;; +;; * sml-mode.el (sml--rightalign-and-p): New function. +;; +;; 2014-06-03 Stefan Monnier +;; +;; * sml-mode/sml-mode.el (sml-smie-grammar): Add include&sharing. +;; (sml-smie-rules): Add functor rule. +;; (sml-smie-definitional-equal-p): Use smie-backward-sexp. +;; +;; 2013-12-27 Stefan Monnier +;; +;; * sml-mode.el (sml-smie-rules): Adjust for new :close-all rule. +;; +;; 2013-03-03 Stefan Monnier +;; +;; * packages/sml-mode/sml-mode.el (sml-imenu-regexp): Make it a const. +;; (sml-imenu-create-index): Don't assume we'll find an = after structure. +;; +;; 2013-01-24 Stefan Monnier +;; +;; * sml-mode: Release 6.3, bugfixes +;; +;; 2013-01-24 Stefan Monnier +;; +;; * sml-mode.el (sml-mode-variables): Set sml-prog-proc-descriptor here... +;; (sml-mode): ... instead of here. +;; +;; 2013-01-24 Stefan Monnier +;; +;; * sml-mode.el (inferior-sml-mode): Fix comint-completion-addsuffix. +;; +;; 2012-12-04 Stefan Monnier +;; +;; * packages/sml-mode/sml-mode.el (sml-mode-map): Add back C-c C-s +;; binding. +;; (sml-prog-proc-switch-to): Add missing interactive spec. +;; +;; 2012-10-31 Stefan Monnier +;; +;; * sml-mode.el: Integrate BUGS&NEWS; re-add run-sml. +;; +;; 2012-10-22 Stefan Monnier +;; +;; Add SML-mode. +;; +;; git-subtree-dir: packages/sml-mode git-subtree-mainline: +;; a50c62a632aa422957a0e4224d5c6e4c2366156b git-subtree-split: +;; d2ef91a138487b521bb7e08722b8d122aa757b5a +;; + (provide 'sml-mode) ;;; sml-mode.el ends here