[elpa] master 3442ac1: * externals-list: Add modus-themes

[Stefan Monnier]

branch: master
commit 3442ac19bd0dd6f2ca8e5fdb9abf943a3e86b190
Author: Stefan Monnier 
Commit: Stefan Monnier 

* externals-list: Add modus-themes
---
 externals-list | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/externals-list b/externals-list
index ef5d611..e27921e 100644
--- a/externals-list
+++ b/externals-list
@@ -105,6 +105,8 @@
  ("map" :core "lisp/emacs-lisp/map.el")
  ("math-symbol-lists"  :subtree 
"https://github.com/vspinu/math-symbol-lists.git;)
  ("mmm-mode":external "https://github.com/purcell/mmm-mode.git;)
+ ("modus-operandi-theme":external 
"https://gitlab.com/protesilaos/modus-themes;)
+ ("modus-vivendi-theme":external 
"https://gitlab.com/protesilaos/modus-themes;)
  ("muse"   :subtree "https://github.com/alexott/muse;)
  ("nameless"   :subtree "https://github.com/Malabarba/Nameless;)
  ("names"  :subtree "http://github.com/Malabarba/names;)

[elpa] externals/modus-vivendi-theme 3da1f9b 2/2: Remove other file from branch

[Stefan Monnier]

branch: externals/modus-vivendi-theme
commit 3da1f9beb8c59dc5dd7e8e66d647bb3f2a389b2d
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Remove other file from branch
---
 modus-operandi-theme.el | 2255 ---
 1 file changed, 2255 deletions(-)

diff --git a/modus-operandi-theme.el b/modus-operandi-theme.el
deleted file mode 100644
index 319435a..000
--- a/modus-operandi-theme.el
+++ /dev/null
@@ -1,2255 +0,0 @@
-;;; modus-operandi-theme.el --- Accessible light theme (WCAG AAA) -*- 
lexical-binding:t -*-
-
-;; Copyright (c) 2019-2020 Free Software Foundation, Inc.
-
-;; Author: Protesilaos Stavrou 
-;; URL: https://gitlab.com/protesilaos/modus-themes
-;; Version: 0.6.0
-;; Package-Requires: ((emacs "26.1"))
-;; Keywords: faces, theme, accessibility
-
-;; This file is NOT part of GNU Emacs.
-
-;; This program is free software; you can redistribute it and/or
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 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, see .
-
-;;; Commentary:
-;;
-;; This theme is designed for colour-contrast accessibility.
-;;
-;; 1. Provide a consistent minimum contrast ratio between background and
-;; foreground values of 7:1 or higher.  This meets the highest such
-;; accessibility criterion per the guidelines of the Worldwide Web
-;; Consortium's Working Group on Accessibility (WCAG AAA standard).
-;;
-;; 2. Offer as close to full face coverage as possible.  The list is
-;; already quite long (see further below), with more additions to follow
-;; as part of the ongoing development process.
-;;
-;; The theme provides the following customisation options, all of which
-;; are disabled by default:
-;;
-;; modus-operandi-theme-slanted-constructs
-;; modus-operandi-theme-bold-constructs
-;; modus-operandi-theme-proportional-fonts
-;; modus-operandi-theme-scale-headings
-;;
-;; The default scale is as follows (it can be customised as well):
-;;
-;; modus-operandi-theme-scale-1 1.05
-;; modus-operandi-theme-scale-2 1.1
-;; modus-operandi-theme-scale-3 1.15
-;; modus-operandi-theme-scale-4 1.2
-;;
-;; What follows is the list of explicitly supported packages or face
-;; groups (there are implicitly supported packages as well, which
-;; inherit from font-lock or some basic group).  You are encouraged to
-;; notify me of any missing package or change you would like to see.
-;;
-;; ace-window
-;; alert
-;; all-the-icons
-;; annotate
-;; anzu
-;; apropos
-;; apt-sources-list
-;; artbollocks-mode
-;; auto-dim-other-buffers
-;; avy
-;; breakpoint (provided by built-in gdb-mi.el)
-;; calendar and diary
-;; calfw
-;; change-log and log-view (`vc-print-log' and `vc-print-root-log')
-;; column-enforce-mode
-;; company-mode
-;; company-posframe
-;; compilation-mode
-;; completions
-;; counsel
-;; counsel-css
-;; counsel-notmuch
-;; counsel-org-capture-string
-;; cov
-;; custom (M-x customize)
-;; dap-mode
-;; dashboard (emacs-dashboard)
-;; deadgrep
-;; define-word
-;; deft
-;; diff-hl
-;; diff-mode
-;; dim-autoload
-;; dired
-;; dired-async
-;; dired-git
-;; dired-git-info
-;; dired-narrow
-;; dired-subtree
-;; diredfl
-;; disk-usage
-;; doom-modeline
-;; easy-jekyll
-;; easy-kill
-;; ediff
-;; eldoc-box
-;; elfeed
-;; emms
-;; enhanced-ruby-mode
-;; epa
-;; equake
-;; erc
-;; ert
-;; eshell
-;; evil (evil-mode)
-;; evil-goggles
-;; evil-visual-mark-mode
-;; eww
-;; eyebrowse
-;; fancy-dabbrev
-;; flycheck
-;; flycheck-indicator
-;; flycheck-posframe
-;; flymake
-;; flyspell
-;; focus
-;; font-lock (generic syntax highlighting)
-;; fountain (fountain-mode)
-;; geiser
-;; git
-;; git-gutter (and variants)
-;; git-lens
-;; git-timemachine
-;; gnus
-;; helm
-;; helm-ls-git
-;; helm-xref
-;; highlight-blocks
-;; hl-fill-column
-;; hl-line-mode
-;; hydra
-;; ido-mode
-;; iedit
-;; imenu-list
-;; info
-;; info-colors
-;; isearch, occur, etc.
-;; ivy
-;; ivy-posframe
-;; jira (org-jira)
-;; js2-mode
-;; jupyter
-;; keycast
-;; line numbers (`display-line-numbers-mode' and global variant)
-;; lsp-mode
-;; lsp-ui
-;; magit
-;; markdown-mode
-;; mentor
-;; 

[elpa] externals/modus-vivendi-theme 2e1640d 1/2: Include ELPA in README. Adapt accordingly.

[Stefan Monnier]

branch: externals/modus-vivendi-theme
commit 2e1640d586ffcc7b6c15bed01755639309dfbc8a
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Include ELPA in README.  Adapt accordingly.
---
 README.org | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.org b/README.org
index 643d130..5ffdbae 100644
--- a/README.org
+++ b/README.org
@@ -31,9 +31,9 @@ earlier, "alpha" versions).
:END:
 
 I maintain /Modus Operandi/ (light theme) and /Modus Vivendi/ (dark) as
-standalone packages in [[http://melpa.org/][MELPA]] (and MELPA Stable).  
Assuming you have
-configured that repository for your package management needs, you can
-just run:
+standalone packages in ELPA, MELPA, and MELPA Stable.
+
+Just run:
 
 =M-x package-install RET modus-operandi-theme RET=
 

[elpa] branch externals/modus-vivendi-theme created (now 3da1f9b)

[Stefan Monnier]

monnier pushed a change to branch externals/modus-vivendi-theme.

at  3da1f9b   Remove other file from branch

This branch includes the following new commits:

   new  2e1640d   Include ELPA in README.  Adapt accordingly.
   new  3da1f9b   Remove other file from branch

[elpa] branch externals/modus-operandi-theme created (now 616300d)

[Stefan Monnier]

monnier pushed a change to branch externals/modus-operandi-theme.

at  616300d   Remove other file from branch

This branch includes the following new commits:

   new  d116870   Initial commit of Modus Themes (prototype)
   new  d5a9b59   Minor theme refinements
   new  2dae3c4   Corrent designation for light/dark theme
   new  6e1f665   Minor stylistic correction
   new  8cd8edf   Refinements and fixes
   new  047e80c   FULL REWRITE: make the themes more programmatic
   new  016e236   Update README to reflect the FULL REWRITE of 047e80c
   new  720e951   Minor documentation fixes
   new  dcf00a3   Add styles for `error' face
   new  f6b6381   Add support for Magit process faces
   new  e80cde4   Basic support for EMMS (playlist view)
   new  d7d81e2   Support for ivy and swiper
   new  ffb6dca   Modus Vivendi: tweak subtle and intense backgrounds
   new  f90d0ea   Remove duplicate for swiper line
   new  947697c   Add support for visual-regexp faces
   new  5dcaace   Tweak subtle and intense backgrounds
   new  093ef95   Modus Operandi: tweak inactive colours for better 
distinction.
   new  eeef6d9   Modeline tweaks
   new  9bf2f1e   Add support for additional dired faces
   new  e09982b   Add support for `which-key'
   new  a0112cd   Remove trailing whitespace
   new  0b6f749   Update README with more pertinent information
   new  062787d   Modus operandi: fix inconsistent colours
   new  de92650   Define subtle and intense neutral backgrounds
   new  9f7ed17   Expand face coverage.  Minor refinements
   new  258b7d4   Attempt to fix #1 (region under hl-line)
   new  0a92de7   Modus operandi: Fix duplicate colour of red-alt, 
red-alt-other
   new  18039bf   Change matching parenthesis colour (extends 258b7d4)
   new  da82475   Revise org-block line styles (extends 258b7d4)
   new  5834a5c   Modus operandi: tweak subtle and intense backgrounds
   new  f2f1229   Improved git commit warning for long summary (character 
length)
   new  23a1553   Tweak "neutral" backgrounds:  improves combination with 
accented bgs
   new  2e5032c   Modus vivendi: tweak subtle/intense yellow bg and subtle 
green bg.
   new  a6a4f70   Make org block start/end more subtle
   new  4597be5   Modus operandi: tweak intense green background
   new  6edf28a   Modus vivendi: tweak subtle and intense accented 
backgrounds
   new  738cecc   Modus operandi: further tweaks to intense/subtle 
backgrounds.
   new  e1cc2c6   Add support for highlighting changes
   new  b0a7d04   Add support for info pages
   new  6ab6da6   Add INITIAL support for company-mode (see commit body)
   new  b1e10fb   Improve highlighting of matching expression within 
parentheses.
   new  e5d7092   Review {fg,bg}-inactive.  Add {fg,bg}-active.
   new  3523090   Update mode-line settings.  Extends e5d7092.
   new  7097109   Update face for parenthetic expression match.  Extends 
e5d7092.
   new  fc392b1   Update Magit diff hunk heading states.  Extends e5d7092.
   new  cee60de   Update Org block wrapper lines.  Extends e5d7092.
   new  4e22942   Update company scroll bar bg and fg.  Extends e5d7092.
   new  a51f4d8   Modus operandi: fix inaccessible magenta
   new  d4ac8db   Modus vivendi: several palette refinements—better colour 
distinction
   new  b4225c9   Make Org code block background same as main bg.
   new  1599396   Minor tweaks to various font-lock constructs.
   new  b5ee4e8   Tweak org-verbatim to disambiguate it from links and code 
blocks
   new  165b207   Add support for which-function
   new  01a4f8d   Add styles for undo-tree
   new  f53c63b   Make Dired async message green instead of yellow (more 
appropriate).
   new  b0aaab9   Review elfeed styles. Add accent colours to feed name and 
tags.
   new  98de00a   Widget button uses same styles as button (inherit from 
link).
   new  7af037a   MAJOR UPDATE: initial support for Gnus
   new  c9cc02d   MAJOR UPDATE: initial support for MU4E.
   new  63d109e   Minor correction to mu4e header highlight
   new  764f80a   Minor refinements to mu4e modeline styles
   new  0593cb9   Tweak styles for ido-mode
   new  34f6155   Make ido colour for subdirs more consistent with dired 
subdirs.
   new  d730877   Minor tweaks for mu4e styles.
   new  5ea4414   General refinements to IDO styles
   new  4665c78   Palette refinements in both themes
   new  98c4e75   Tweak minibuffer-prompt.  Improves contrast with certain 
matches.
   new  b0a3e15   Modus vivendi: several palette refinements (read commit 
message)
   new  f2d780f   Support a couple of miscellaneous styles
   new  f0b0a5f   Support the various "message" constructs. Move them above 
elfeed.
   new  b3c645a   Modus vivendi: palette tweaks to improve colour 

[elpa] master 6c631e0: * packages/auto-overlays/: Activate lexical-binding.

[Stefan Monnier]

branch: master
commit 6c631e0a914366e28bd48dacd48c1d78cfd1144d
Author: Stefan Monnier 
Commit: Stefan Monnier 

* packages/auto-overlays/: Activate lexical-binding.

* packages/auto-overlays/auto-overlays.el: Don't require `cl`.
Prefer `defsubst` over `defmacro` when possible.
(auto-o-adjoin): Use `setq` rather than `setf`.
(auto-o-entry): Hoist the common `cdr` outside the `if`.
(auto-o-sublist): Remove redundant test (we know it's nil).
(auto-overlay-load-regexp): Simplify adding to the end.
(auto-overlay-update): Simplify with DeMorgan.
(auto-o-match-overlay): Hoist common code out of `if`.

* packages/auto-overlays/auto-overlay-common.el (auto-overlays-in): 
Simplify.

* packages/auto-overlays/auto-overlay-flat.el (auto-o-flat-suicide):
Remove unused var `o-start`.
---
 packages/auto-overlays/auto-overlay-common.el  |  17 +-
 packages/auto-overlays/auto-overlay-flat.el|  12 +-
 packages/auto-overlays/auto-overlay-line.el|   9 +-
 packages/auto-overlays/auto-overlay-nested.el  |  11 +-
 packages/auto-overlays/auto-overlay-self.el|  17 +-
 packages/auto-overlays/auto-overlay-word.el|   9 +-
 packages/auto-overlays/auto-overlays-compat.el |   5 +-
 packages/auto-overlays/auto-overlays.el| 295 -
 8 files changed, 181 insertions(+), 194 deletions(-)

diff --git a/packages/auto-overlays/auto-overlay-common.el 
b/packages/auto-overlays/auto-overlay-common.el
index e1c539a..c718cf8 100644
--- a/packages/auto-overlays/auto-overlay-common.el
+++ b/packages/auto-overlays/auto-overlay-common.el
@@ -1,7 +1,7 @@
-;;; auto-overlay-common.el --- general overlay functions
+;;; auto-overlay-common.el --- general overlay functions  -*- lexical-binding: 
t; -*-
 
 
-;; Copyright (C) 2005-2015  Free Software Foundation, Inc
+;; Copyright (C) 2005-2020  Free Software Foundation, Inc
 
 ;; Author: Toby Cubitt 
 ;; Maintainer: Toby Cubitt 
@@ -117,18 +117,13 @@ PROP-TEST."
 
   ;; make sure prop-test is a list of lists, even if there's only one, and
   ;; exclude inactive overlays unless told not to
-  (cond
-   ((null prop-test)
-(unless inactive (setq prop-test '((null inactive)
-   ((functionp (car prop-test))
-(if inactive
-   (setq prop-test (list prop-test))
-  (setq prop-test (list '(null inactive) prop-test
-   (t
-(unless inactive (setq prop-test (push '(null inactive) prop-test)
+  (when (functionp (car prop-test))
+(setq prop-test (list prop-test)))
+  (unless inactive (push '(null inactive) prop-test))
 
   (let (overlay-list function prop-list value-list result)
 ;; check properties of each overlay in region
+;; FIXME: We should ask Emacs's core to do the sorting.
 (dolist (o (overlays-in start end))
   ;; check overlay is entirely within region
   (if (and within
diff --git a/packages/auto-overlays/auto-overlay-flat.el 
b/packages/auto-overlays/auto-overlay-flat.el
index c790059..af004ca 100644
--- a/packages/auto-overlays/auto-overlay-flat.el
+++ b/packages/auto-overlays/auto-overlay-flat.el
@@ -1,7 +1,6 @@
-;;; auto-overlay-flat.el --- flat start/end-delimited automatic overlays
+;;; auto-overlay-flat.el --- flat start/end-delimited automatic overlays  -*- 
lexical-binding: t; -*-
 
-
-;; Copyright (C) 2005-2015  Free Software Foundation, Inc
+;; Copyright (C) 2005-2020  Free Software Foundation, Inc
 
 ;; Author: Toby Cubitt 
 ;; Maintainer: Toby Cubitt 
@@ -32,8 +31,8 @@
 
 ;; set flat overlay parsing and suicide functions, and indicate class requires
 ;; separate start and end regexps
-(put 'flat 'auto-overlay-parse-function 'auto-o-parse-flat-match)
-(put 'flat 'auto-overlay-suicide-function 'auto-o-flat-suicide)
+(put 'flat 'auto-overlay-parse-function #'auto-o-parse-flat-match)
+(put 'flat 'auto-overlay-suicide-function #'auto-o-flat-suicide)
 (put 'flat 'auto-overlay-complex-class t)
 
 
@@ -148,8 +147,7 @@
 
 
  (t ;; if we're an end-match, look for next end-match...
-  (let ((o-start (overlay-get o-parent 'start))
-   (o-end (auto-o-next-flat-match o-self 'end)))
+  (let ((o-end (auto-o-next-flat-match o-self 'end)))
(cond
 ;; if there is one, match parent with it
 (o-end
diff --git a/packages/auto-overlays/auto-overlay-line.el 
b/packages/auto-overlays/auto-overlay-line.el
index 0241e97..61aee30 100644
--- a/packages/auto-overlays/auto-overlay-line.el
+++ b/packages/auto-overlays/auto-overlay-line.el
@@ -1,7 +1,6 @@
-;;; auto-overlay-line.el --- automatic overlays for single lines
+;;; auto-overlay-line.el --- automatic overlays for single lines  -*- 
lexical-binding: t; -*-
 
-
-;; Copyright (C) 2005-2015  Free Software Foundation, Inc
+;; Copyright (C) 2005-2020  Free Software Foundation, Inc
 
 ;; Author: Toby Cubitt 
 ;; Maintainer: Toby Cubitt 
@@ -31,7 +30,7 @@
 
 
 ;; set line overlay parsing and suicide funtions
-(put 'line 'auto-overlay-parse-function 'auto-o-parse-line-match)
+(put 

[elpa] externals/xr 15b867d 2/3: Fix test in Emacs 26 (bug #3)

[Mattias Engdeg�rd]

branch: externals/xr
commit 15b867d343a54102833743e0021ed5795a7d9631
Author: Mattias Engdegård 
Commit: Mattias Engdegård 

Fix test in Emacs 26 (bug #3)

The 'base' category was (or will be) introduced in Emacs 27; make sure
the tests don't actually use it in regexp matching.
Found by Lev Lamberov.
---
 xr-test.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xr-test.el b/xr-test.el
index 397d8f4..432b8af 100644
--- a/xr-test.el
+++ b/xr-test.el
@@ -504,7 +504,7 @@
'((5 . "Branch matches subset of a previous branch"
 (should (equal (xr-lint "\\S-\\|x")
'((5 . "Branch matches subset of a previous branch"
-(should (equal (xr-lint "\\c.\\|a")
+(should (equal (xr-lint "\\cl\\|å")
'((5 . "Branch matches subset of a previous branch"
 (should (equal (xr-lint "\\Ca\\|ü")
'((5 . "Branch matches subset of a previous branch"

[elpa] externals/xr updated (7842512 -> 434b300)

[Mattias Engdeg�rd]

mattiase pushed a change to branch externals/xr.

  from  7842512   Increment version to 1.17
   new  5394d8c   Simplify condition
   new  15b867d   Fix test in Emacs 26 (bug #3)
   new  434b300   Increment version to 1.18


Summary of changes:
 xr-test.el | 2 +-
 xr.el  | 7 ---
 2 files changed, 5 insertions(+), 4 deletions(-)

[elpa] externals/xr 434b300 3/3: Increment version to 1.18

[Mattias Engdeg�rd]

branch: externals/xr
commit 434b3000b0224875893f4feb411c1f65644f8c38
Author: Mattias Engdegård 
Commit: Mattias Engdegård 

Increment version to 1.18
---
 xr.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/xr.el b/xr.el
index c8bd6d2..5e7a11f 100644
--- a/xr.el
+++ b/xr.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2019-2020 Free Software Foundation, Inc.
 
 ;; Author: Mattias Engdegård 
-;; Version: 1.17
+;; Version: 1.18
 ;; Package-Requires: ((emacs "26.1"))
 ;; URL: https://github.com/mattiase/xr
 ;; Keywords: lisp, regexps
@@ -29,6 +29,8 @@
 
 ;;; News:
 
+;; Version 1.18:
+;; - Fix test broken in Emacs 26
 ;; Version 1.17:
 ;; - Performance improvements
 ;; Version 1.16:

[elpa] externals/xr 5394d8c 1/3: Simplify condition

[Mattias Engdeg�rd]

branch: externals/xr
commit 5394d8c22bc37e332043a29f32614a1b496b4524
Author: Mattias Engdegård 
Commit: Mattias Engdegård 

Simplify condition
---
 xr.el | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/xr.el b/xr.el
index 772605e..c8bd6d2 100644
--- a/xr.el
+++ b/xr.el
@@ -1151,8 +1151,7 @@ A-SETS and B-SETS are arguments to `any'."
 (push seq alternatives)))
 (if (cdr alternatives)
 ;; Simplify (or nonl "\n") to anything
-(if (or (equal alternatives '(nonl "\n"))
-(equal alternatives '("\n" nonl)))
+(if (member alternatives '((nonl "\n") ("\n" nonl)))
 'anything
   (cons 'or (nreverse alternatives)))
   (car alternatives

[elpa] master 00a3cdf: * packages/shen-mode/shen-mode.el: Don't require `cl`

[Stefan Monnier]

branch: master
commit 00a3cdf451cd353d717e98124c8827618f6c1d92
Author: Stefan Monnier 
Commit: Stefan Monnier 

* packages/shen-mode/shen-mode.el: Don't require `cl`
---
 packages/shen-mode/shen-mode.el | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/shen-mode/shen-mode.el b/packages/shen-mode/shen-mode.el
index 81c2829..7817de9 100644
--- a/packages/shen-mode/shen-mode.el
+++ b/packages/shen-mode/shen-mode.el
@@ -1,6 +1,6 @@
 ;;; shen-mode.el --- A major mode for editing shen source code
 
-;; Copyright (C) 2011, 2013 Free Software Foundation, Inc.
+;; Copyright (C) 2011-2020 Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte 
 ;; Version: 0.1
@@ -30,7 +30,7 @@
 ;; following for more information on Shen.  http://www.shenlanguage.org
 
 ;;; Code:
-(eval-when-compile (require 'cl))
+
 (require 'lisp-mode)
 (require 'imenu)
 
@@ -253,7 +253,8 @@
   (append
'("let" "=" "eval-without-reader-macros" "freeze" "type") ; generic
'("if" "and" "or" "cond")) t) ; boolean
- "\\>") . 1)
+ "\\>")
+   . 1)
   ;; errors
   ("(\\(error\\)\\>" 1 font-lock-warning-face)
   ;; built-in
@@ -293,7 +294,8 @@
(lambda (cnst) (format "*%s*" cnst))
'("language" "implementation" "port" "porters"
  "stinput" "home-directory" "version"
- "maximum-print-sequence-size" "printer" "macros")) t)
+ "maximum-print-sequence-size" "printer" "macros"))
+  t)
  "\\>")
1 font-lock-builtin-face)))
   "Default expressions to highlight in Shen mode.")