diff -Nru smart-mode-line-2.12.0/debian/changelog smart-mode-line-2.13/debian/changelog --- smart-mode-line-2.12.0/debian/changelog 2018-10-03 03:21:57.000000000 +0000 +++ smart-mode-line-2.13/debian/changelog 2019-07-08 21:24:32.000000000 +0000 @@ -1,3 +1,16 @@ +smart-mode-line (2.13-1) unstable; urgency=medium + + * New upstream version. + * Set Upstream-Contact to the email address that tagged this release. + * Rebase 0003-Fix-privacy-breach-generic-logo-and-donation.patch + onto upstream 2.13. + * Drop "Enhances: emacs25" because the package was removed in buster. + * Update my copyright years. + * Switch to debhelper-compat 12. + * Declare Standards-Version: 4.4.0. (No changes needed) + + -- Nicholas D Steeves Mon, 08 Jul 2019 17:24:32 -0400 + smart-mode-line (2.12.0-1) unstable; urgency=medium * New upstream release. diff -Nru smart-mode-line-2.12.0/debian/compat smart-mode-line-2.13/debian/compat --- smart-mode-line-2.12.0/debian/compat 2018-10-03 03:21:57.000000000 +0000 +++ smart-mode-line-2.13/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -11 diff -Nru smart-mode-line-2.12.0/debian/control smart-mode-line-2.13/debian/control --- smart-mode-line-2.12.0/debian/control 2018-10-03 03:21:57.000000000 +0000 +++ smart-mode-line-2.13/debian/control 2019-07-08 21:24:32.000000000 +0000 @@ -3,9 +3,9 @@ Priority: optional Maintainer: Debian Emacsen team Uploaders: Nicholas D Steeves -Build-Depends: debhelper (>= 11~) +Build-Depends: debhelper-compat (= 12) , dh-elpa -Standards-Version: 4.2.1 +Standards-Version: 4.4.0 Vcs-Browser: https://salsa.debian.org/emacsen-team/smart-mode-line Vcs-Git: https://salsa.debian.org/emacsen-team/smart-mode-line.git Homepage: https://github.com/Malabarba/smart-mode-line @@ -17,7 +17,6 @@ Recommends: emacs (>= 46.0) Suggests: elpa-solarized-theme Enhances: emacs - , emacs25 , elpa-solarized-theme Description: powerful and beautiful mode-line for Emacs Smart Mode Line is a sexy mode-line for Emacs. Its main features are: @@ -43,7 +42,6 @@ , ${misc:Depends} Recommends: emacs (>= 46.0) Enhances: emacs - , emacs25 , elpa-smart-mode-line , elpa-powerline (>= 2.2) Description: Smart Mode Line themes that use Emacs Powerline diff -Nru smart-mode-line-2.12.0/debian/copyright smart-mode-line-2.13/debian/copyright --- smart-mode-line-2.12.0/debian/copyright 2018-10-03 03:21:57.000000000 +0000 +++ smart-mode-line-2.13/debian/copyright 2019-07-08 21:24:32.000000000 +0000 @@ -1,13 +1,14 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: smart-mode-line Source: https://github.com/Malabarba/smart-mode-line +Upstream-Contact: Artur Malabarba Files: * Copyright: 2012-2017 Artur Malabarba License: GPL-2+ Files: debian/* -Copyright: 2017 Nicholas D Steeves +Copyright: 2017-2019 Nicholas D Steeves License: GPL-2+ License: GPL-2+ diff -Nru smart-mode-line-2.12.0/debian/patches/0003-Fix-privacy-breach-generic-logo-and-donation.patch smart-mode-line-2.13/debian/patches/0003-Fix-privacy-breach-generic-logo-and-donation.patch --- smart-mode-line-2.12.0/debian/patches/0003-Fix-privacy-breach-generic-logo-and-donation.patch 2018-10-03 03:21:57.000000000 +0000 +++ smart-mode-line-2.13/debian/patches/0003-Fix-privacy-breach-generic-logo-and-donation.patch 2019-07-08 21:24:32.000000000 +0000 @@ -2,14 +2,14 @@ Date: Fri, 9 Jun 2017 15:14:08 -0400 Subject: Fix privacy-breach generic, logo, and donation Forwarded: not-needed -Last-Update: 2018-10-01 +Last-Update: 2019-05-17 --- - README.org | 37 +++++++++++++------------------------ - 1 file changed, 13 insertions(+), 24 deletions(-) + README.org | 43 ++++++++++++++++--------------------------- + 1 file changed, 16 insertions(+), 27 deletions(-) diff --git a/README.org b/README.org -index 15d86f7..35711d4 100644 +index 3ef05b6..6ccce9c 100644 --- a/README.org +++ b/README.org @@ -1,6 +1,4 @@ @@ -35,10 +35,11 @@ -[[https://raw.github.com/Malabarba/smart-mode-line/master/screenshot-atom-one-dark.png]] +[[file:screenshot-atom-one-dark.png]] - (Note: to use the Atom-one theme, install the --[[https://github.com/daviderestivo/smart-mode-line-atom-one-dark-theme][=smart-mode-line-atom-one-dark-theme=]] +-(Note: to use the Atom-one theme, install the +-[[https://github.com/daviderestivo/smart-mode-line-atom-one-dark-theme][smart-mode-line-atom-one-dark-theme]] -package from MELPA) -+[[https://github.com/daviderestivo/smart-mode-line-atom-one-dark-theme][=elpa-smart-mode-line-atom-one-dark-theme=]] package) ++(Note: to use the Atom-one theme, install ++=elpa-smart-mode-line-atom-one-dark-theme=) *Solarized Dark Theme*\\ -[[https://cloud.githubusercontent.com/assets/601365/7131638/34a3b0f8-e247-11e4-8fd5-811365167d22.png]] @@ -48,10 +49,11 @@ -[[https://cloud.githubusercontent.com/assets/601365/7131637/34946ac6-e247-11e4-8e0e-35a47df70686.png]] +[[file:screenshot-solarized-light-theme.png]] - (Note: to use the Solarized themes, install the --[[https://github.com/bbatsov/solarized-emacs/][=solarized-theme=]] +-(Note: to use the Solarized themes, install the +-[[https://github.com/bbatsov/solarized-emacs/][solarized-theme]] -package from MELPA) -+=elpa-solarized-theme= package) ++(Note: to use the Solarized themes, install ++=elpa-solarized-theme=) *Powerline Theme*\\ -[[https://raw.github.com/Malabarba/smart-mode-line/master/screenshot-powerline-theme.png]] @@ -61,9 +63,10 @@ -[[https://raw.github.com/Malabarba/smart-mode-line/master/screenshot-light-powerline-theme.png]] +[[file:screenshot-light-powerline-theme.png]] - (Note: to use either powerline theme, install the +-(Note: to use either powerline theme, install the -=smart-mode-line-powerline-theme= package from MELPA) -+=elpa-smart-mode-line-powerline-theme= package) ++(Note: to use either powerline theme, install ++=elpa-smart-mode-line-powerline-theme=) * Installation diff -Nru smart-mode-line-2.12.0/README.org smart-mode-line-2.13/README.org --- smart-mode-line-2.12.0/README.org 2018-09-25 00:30:26.000000000 +0000 +++ smart-mode-line-2.13/README.org 2019-05-15 11:10:23.000000000 +0000 @@ -18,7 +18,7 @@ [[https://raw.github.com/Malabarba/smart-mode-line/master/screenshot-atom-one-dark.png]] (Note: to use the Atom-one theme, install the -[[https://github.com/daviderestivo/smart-mode-line-atom-one-dark-theme][=smart-mode-line-atom-one-dark-theme=]] +[[https://github.com/daviderestivo/smart-mode-line-atom-one-dark-theme][smart-mode-line-atom-one-dark-theme]] package from MELPA) *Solarized Dark Theme*\\ @@ -28,7 +28,7 @@ [[https://cloud.githubusercontent.com/assets/601365/7131637/34946ac6-e247-11e4-8e0e-35a47df70686.png]] (Note: to use the Solarized themes, install the -[[https://github.com/bbatsov/solarized-emacs/][=solarized-theme=]] +[[https://github.com/bbatsov/solarized-emacs/][solarized-theme]] package from MELPA) *Powerline Theme*\\ diff -Nru smart-mode-line-2.12.0/smart-mode-line.el smart-mode-line-2.13/smart-mode-line.el --- smart-mode-line-2.12.0/smart-mode-line.el 2018-09-25 00:30:26.000000000 +0000 +++ smart-mode-line-2.13/smart-mode-line.el 2019-05-15 11:10:23.000000000 +0000 @@ -4,7 +4,7 @@ ;; Author: Artur Malabarba ;; URL: http://github.com/Malabarba/smart-mode-line -;; Version: 2.10 +;; Version: 2.13 ;; Package-Requires: ((emacs "24.3") (rich-minority "0.1.1")) ;; Keywords: mode-line faces themes ;; Prefix: sml @@ -310,7 +310,7 @@ (require 'cus-face) (require 'rich-minority) -(defconst sml/version "2.10" "Version of the smart-mode-line.el package.") +(defconst sml/version "2.13" "Version of the smart-mode-line.el package.") (defun sml/bug-report () "Opens github issues page in a web browser. Please send me any bugs you find, and please include your Emacs and sml versions." (interactive) @@ -515,6 +515,12 @@ :group 'smart-mode-line-others :package-version '(smart-mode-line . "1.16")) +(defcustom sml/not-modified-char " " + "String that indicates if buffer is un-modified. Should be one SINGLE char." + :type 'string + :group 'smart-mode-line-others + :package-version '(smart-mode-line . "1.16")) + (defcustom sml/show-trailing-N t "Whether the \"\" suffix in buffer names should be displayed in the mode-line." :type 'boolean @@ -579,6 +585,7 @@ (defcustom sml/prefix-face-list '((":SU:" sml/sudo) (":G" sml/git) + (sml/projectile-replacement-format sml/projectile) ("" sml/prefix)) "List of (STRING FACE) pairs used by `sml/propertize-prefix'. @@ -603,6 +610,8 @@ (integer :tag "Maximum width"))) :group 'smart-mode-line-path-and-prefix) +(defvaralias 'sml/path-width 'sml/name-width) + (defcustom sml/shorten-directory t "Should directory name be shortened to fit width? @@ -1126,10 +1135,7 @@ :group 'smart-mode-line-others :package-version '(smart-mode-line . "2.4.1")) (defface sml/projectile '((t :inherit sml/git)) "" :group 'smart-mode-line-faces) - (add-to-list 'sml/prefix-regexp (format (regexp-quote sml/projectile-replacement-format) ".*")) - (add-to-list 'sml/prefix-face-list - (list (format (regexp-quote sml/projectile-replacement-format) ".*") - 'sml/projectile)))) + (add-to-list 'sml/prefix-regexp (format (regexp-quote sml/projectile-replacement-format) ".*")))) ;; vc-mode (eval-after-load "vc-hooks" @@ -1316,7 +1322,7 @@ (buffer-read-only (propertize sml/read-only-char 'face 'sml/read-only 'help-echo "Read-Only Buffer")) - (t (propertize " " 'face 'sml/not-modified)))) + (t (propertize sml/not-modified-char 'face 'sml/not-modified)))) (defmacro sml/propertize-position (s face help) "Propertize string S as a line/column number, using FACE and help-echo HELP." @@ -1363,7 +1369,8 @@ (setq sml/buffer-identification-filling nil) (when (or ;; Only calculate all this if it will actually be used (equal sml/mode-line-buffer-identification mode-line-buffer-identification) - (member (cadr sml/mode-line-buffer-identification) mode-line-buffer-identification) + (and (listp mode-line-buffer-identification) + (member (cadr sml/mode-line-buffer-identification) mode-line-buffer-identification)) (member sml/mode-line-buffer-identification mode-line-buffer-identification)) (setq sml/buffer-identification (let* ((dir (sml/replacer (abbreviate-file-name (sml/get-directory)))) @@ -1588,7 +1595,12 @@ (defun sml/propertize-prefix (prefix) "Set the color of PREFIX according to its contents." (cl-loop for pair in sml/prefix-face-list - if (string-match (car pair) prefix) + if (let* ((c (car pair)) + (s (if (symbolp c) + (when (boundp c) (symbol-value c)) + c))) + (when s + (string-match (format (regexp-quote s) ".*") prefix))) return (propertize prefix 'face (car (cdr pair))))) (defun sml/get-directory () @@ -1635,6 +1647,14 @@ in (sml/replacer-raw in))) +(defcustom sml/fallback-on-buffer-identification nil + "Whether to fallback on regular buffer-identification. +Defines the what should be displayed in the buffer identification +if it is unchanged by the entries in `sml/replacer-regexp-list'. +If the value is nil, use the sml behaviour (full file name). +Otherwise, use the default Emacs behaviour (usually just `buffer-name')." + :type 'boolean) + (defun sml/replacer-raw (in) "Run on the string IN the replacements from `sml/replacer-regexp-list'. @@ -1650,6 +1670,9 @@ (when (string= out in) (dolist (cur sml/replacer-regexp-list) (setq out (replace-regexp-in-string (car cur) (car (cdr cur)) out)))) + (when (and sml/fallback-on-buffer-identification + (string= out in)) + (setq out (format-mode-line (propertized-buffer-identification "%12b")))) ;; Try truename replacements (when (string= out in) (let* ((true-in (abbreviate-file-name (if (file-remote-p in)