diff -Nru dpkg-dev-el-37.4/debian/changelog dpkg-dev-el-37.7/debian/changelog --- dpkg-dev-el-37.4/debian/changelog 2018-07-28 22:12:32.000000000 +0000 +++ dpkg-dev-el-37.7/debian/changelog 2018-10-20 23:39:34.000000000 +0000 @@ -1,3 +1,28 @@ +dpkg-dev-el (37.7) unstable; urgency=medium + + * fix comment-start-skip (Closes: #718539) + * use syntax-propertize-function for comments (Closes: 737673) + + -- David Bremner Sat, 20 Oct 2018 20:39:34 -0300 + +dpkg-dev-el (37.6) unstable; urgency=medium + + * Load dpkg-dev-el.el at startup. + * Bug fix: "auto-mode-alist README.source regexp", thanks to Kevin Ryde + (Closes: #672195). + + -- David Bremner Fri, 19 Oct 2018 22:44:15 -0300 + +dpkg-dev-el (37.5) unstable; urgency=medium + + * debian-changelog-mode: (require 'faces). Bug fix: + "debian-changelog-warning-face not defined in Emacs 23", thanks to + Trent W. Buck (Closes: #592195). + * debian-changelog-mode: use defface to define + debian-changelog-warning-face (Closes: #500642) + + -- David Bremner Thu, 18 Oct 2018 21:28:20 -0300 + dpkg-dev-el (37.4) unstable; urgency=medium * Upload to unstable (Closes: #904816). Thanks to Sven Joachim for diff -Nru dpkg-dev-el-37.4/debian-autoloads.el dpkg-dev-el-37.7/debian-autoloads.el --- dpkg-dev-el-37.4/debian-autoloads.el 1970-01-01 00:00:00.000000000 +0000 +++ dpkg-dev-el-37.7/debian-autoloads.el 2018-10-20 23:39:34.000000000 +0000 @@ -0,0 +1,6 @@ +;; Autoloads for package startup + +;; Be backwards compatible with old debian-el package + +;;;###autoload +(require 'dpkg-dev-el) diff -Nru dpkg-dev-el-37.4/debian-changelog-mode.el dpkg-dev-el-37.7/debian-changelog-mode.el --- dpkg-dev-el-37.4/debian-changelog-mode.el 2018-07-08 15:21:22.000000000 +0000 +++ dpkg-dev-el-37.7/debian-changelog-mode.el 2018-10-20 23:39:34.000000000 +0000 @@ -487,7 +487,8 @@ (autoload 'debian-bug-web-developer-page "debian-bug") (defvar debian-bug-open-alist) - +(require 'faces) +(require 'custom) (require 'add-log) (require 'easymenu) (eval-when-compile @@ -1360,7 +1361,7 @@ ; (set (make-local-variable 'paragraph-start) "\\*") ; (set (make-local-variable 'paragraph-separate) "\\*\\|\\s-*$|\\S-") ;; PSG: The following appears to get fill-paragraph to finally work! - (set (make-local-variable 'paragraph-start) "\\*\\|\\s *$\\|\f\\|^\\<") + (set (make-local-variable 'paragraph-start) "\\*\\|\\s [*]$\\|\f\\|^\\<") (set (make-local-variable 'paragraph-separate) "\\s *$\\|\f\\|^\\<") ;; Let each version behave as one page. ;; Match null string on the heading line so that the heading line @@ -1404,9 +1405,11 @@ "Face to use for important keywords.") (cond - ((and (fboundp 'facep) + ((and (fboundp 'defface) (facep 'font-lock-warning-face)) - (copy-face 'font-lock-warning-face 'debian-changelog-warning-face)) + (defface debian-changelog-warning-face '((t :inherit font-lock-warning-face)) + "Face for debian-changelog important strings." + :group 'debian-changelog-faces)) ((fboundp 'defface) (defface debian-changelog-warning-face '((((class grayscale)(background light))(:foreground "DimGray" :bold t)) diff -Nru dpkg-dev-el-37.4/debian-control-mode.el dpkg-dev-el-37.7/debian-control-mode.el --- dpkg-dev-el-37.4/debian-control-mode.el 2018-07-08 15:21:22.000000000 +0000 +++ dpkg-dev-el-37.7/debian-control-mode.el 2018-10-20 23:39:34.000000000 +0000 @@ -160,8 +160,6 @@ (if debian-control-syntax-table () (setq debian-control-syntax-table (make-syntax-table)) - ;; Support # style comments - (modify-syntax-entry ?# "<" debian-control-syntax-table) (modify-syntax-entry ?\n "> " debian-control-syntax-table)) ;; FIXME: As of policy 3.5.6.0, the allowed characters in a field name @@ -233,45 +231,46 @@ ;;;###autoload (define-derived-mode debian-control-mode fundamental-mode "Debian Control" "A major mode for editing Debian control files (i.e. debian/control)." - (if (< emacs-major-version 21) - (message "debian-control-mode only supports emacsen version >= 21; disabling features") - (progn - (set-syntax-table debian-control-syntax-table) - ;; Comments - (make-local-variable 'comment-start-skip) ;Need this for font-lock... - (setq comment-start-skip "\\(^\\|\\s-\\);?#+ *") ;;From perl-mode - (make-local-variable 'comment-start) - (make-local-variable 'comment-end) - (setq comment-start "#" - comment-end "") - - (make-local-variable 'font-lock-defaults) - (setq font-lock-defaults - '(debian-control-font-lock-keywords - nil ;;; Keywords only? No, let it do syntax via table. - nil ;;; case-fold? - nil ;;; Local syntax table. - nil ;;; Use `backward-paragraph' ? No - )) - (set (make-local-variable 'fill-paragraph-function) - #'debian-control-mode-fill-paragraph) - (make-local-variable 'after-change-functions) - (push 'debian-control-mode-after-change-function after-change-functions) - (set (make-local-variable 'imenu-generic-expression) - '((nil "^\\(Package\\|Source\\):\\s-*\\([-a-zA-Z0-9+.]+?\\)\\s-*$" 2))) - - (define-key debian-control-mode-map (kbd "C-c C-b") 'debian-control-view-package-bugs) - (define-key debian-control-mode-map (kbd "C-c C-p") 'debian-control-visit-policy) - (define-key debian-control-mode-map (kbd "C-c C-a") 'debian-control-mode-add-field) - (define-key debian-control-mode-package-name-keymap (if (featurep 'xemacs) - [(control down-mouse-2)] - [(C-mouse-2)]) - 'debian-control-mode-bugs-mouse-click) - (easy-menu-add debian-control-mode-menu) - (if (and (featurep 'goto-addr) goto-address-highlight-p) - (goto-address)) - (let ((after-change-functions nil)) - (debian-control-mode-after-change-function (point-min) (point-max) 0))))) + (set-syntax-table debian-control-syntax-table) + ;; Comments + (make-local-variable 'comment-start-skip) ;Need this for font-lock... + (setq comment-start-skip "^#+\s-*") + (make-local-variable 'comment-start) + (make-local-variable 'comment-end) + (setq comment-start "#" + comment-end "") + + ;; Support # style comments + (setq-local syntax-propertize-function + (syntax-propertize-rules ("^\\(#\\)" (1 "<")))) + + (make-local-variable 'font-lock-defaults) + (setq font-lock-defaults + '(debian-control-font-lock-keywords + nil ;;; Keywords only? No, let it do syntax via table. + nil ;;; case-fold? + nil ;;; Local syntax table. + nil ;;; Use `backward-paragraph' ? No + )) + (set (make-local-variable 'fill-paragraph-function) + #'debian-control-mode-fill-paragraph) + (make-local-variable 'after-change-functions) + (push 'debian-control-mode-after-change-function after-change-functions) + (set (make-local-variable 'imenu-generic-expression) + '((nil "^\\(Package\\|Source\\):\\s-*\\([-a-zA-Z0-9+.]+?\\)\\s-*$" 2))) + + (define-key debian-control-mode-map (kbd "C-c C-b") 'debian-control-view-package-bugs) + (define-key debian-control-mode-map (kbd "C-c C-p") 'debian-control-visit-policy) + (define-key debian-control-mode-map (kbd "C-c C-a") 'debian-control-mode-add-field) + (define-key debian-control-mode-package-name-keymap (if (featurep 'xemacs) + [(control down-mouse-2)] + [(C-mouse-2)]) + 'debian-control-mode-bugs-mouse-click) + (easy-menu-add debian-control-mode-menu) + (if (and (featurep 'goto-addr) goto-address-highlight-p) + (goto-address)) + (let ((after-change-functions nil)) + (debian-control-mode-after-change-function (point-min) (point-max) 0))) (defun debian-control-mode-after-change-function (beg end len) (save-excursion diff -Nru dpkg-dev-el-37.4/dpkg-dev-el.el dpkg-dev-el-37.7/dpkg-dev-el.el --- dpkg-dev-el-37.4/dpkg-dev-el.el 2018-07-08 15:21:22.000000000 +0000 +++ dpkg-dev-el-37.7/dpkg-dev-el.el 2018-10-20 23:39:34.000000000 +0000 @@ -2,7 +2,6 @@ ;;; Commentary: ;; -;; This file is loaded from /etc/emacs/site-start.d/50dpkg-dev-el.el ;;; History: ;; @@ -62,7 +61,7 @@ (add-to-list 'auto-mode-alist '("/debian/[^/]*emacsen-startup\\'" . emacs-lisp-mode)) ;; Closes #490292 -(add-to-list 'auto-mode-alist '("README.source" . readme-debian-mode)) +(add-to-list 'auto-mode-alist '("/README\\.source\\'" . readme-debian-mode)) (when (member 'utf-8 (coding-system-list)) ;; default to utf-8 for debian changelog files