Skip to content

Commit

Permalink
Add some emacs module merges (#84)
Browse files Browse the repository at this point in the history
  • Loading branch information
@AMDmi3
AMDmi3 committed Oct 23, 2018
1 parent 46c535e commit 734d93c
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 1 deletion.
8 changes: 7 additions & 1 deletion 450.wildcard-exceptions.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@
- { setname: go, namepat: "go-?1[0-9._-]+" } # don't mix with e.g. go2, go4
- { setname: go, namepat: "golang[0-9.-]*" }
- { setname: go, name: [go-bin, golang-bin], addflavor: bin }
- { addflag: not_go, name: [go-font,go-fonts,go-for-it,go-ttf,go-tool] }
- { addflag: not_go, name: [go-font,go-fonts,go-for-it,go-ttf,go-tool,go-mode.el] }

- { addflag: not_haskell, name: haskell-mode }

- { setname: gstreamer, namepat: "gstreamer[0-9._-]+" }

Expand All @@ -41,9 +43,13 @@
- { setname: perl, namepat: "perl-?5[0-9.]*" }
- { addflag: not_perl, name: libwww-perl }

- { addflag: not_php, name: php-mode.el }
- { addflag: not_php, name: php-elisp }

# in python category as python modules
- { addflag: not_python, name: python, ruleset: aosc }
- { addflag: not_python, name: python-docs }
- { addflag: not_python, name: python-mode }

# python package manager vs. program wrapper (which was renamed to pipo upstream)
# XXX: generate problem from this
Expand Down
41 changes: 41 additions & 0 deletions 800.renames-and-merges/emacs.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,45 @@
# vim: tabstop=39 expandtab softtabstop=39

- { setname: "emacs:auctex", name: [auctex,emacs-auctex,emacs-mode-auctex] }
- { setname: "emacs:calfw", name: [emacs-calfw, "emacs:emacs-calfw"] }
- { setname: "emacs:circe", name: [circe, emacs-circe] }
- { setname: "emacs:csharp-mode", name: [csharp-mode.el] }
- { setname: "emacs:css-mode", name: [css-mode] }
- { setname: "emacs:d-mode", name: [emacs-d-mode,d-mode.el] }
- { setname: "emacs:dash", name: [emacs-dash, dash.el] }
- { setname: "emacs:doxymacs", name: [doxymacs] }
- { setname: "emacs:ebuild-mode", name: [emacs-ebuild-mode] }
- { setname: "emacs:elib", name: [emacs-elib,elib] }
- { setname: "emacs:emhacks", name: [emhacks,emacs-emhacks] }
- { setname: "emacs:emms", name: [emacs-emms,emms] }
- { setname: "emacs:evil", name: [emacs-evil,evil-el] }
- { setname: "emacs:gnuplot-mode", name: [gnuplot-mode] }
- { setname: "emacs:go-mode", name: [emacs-go-mode, go-mode.el] }
- { setname: "emacs:haskell-mode", name: [emacs-haskell-mode,haskell-mode,haskell-mode.el] }
- { setname: "emacs:howm", name: [howm,emacs-howm] }
- { setname: "emacs:icicles", name: [emacs-icicles,icicles] }
- { setname: "emacs:inform-mode", name: [inform-mode] }
- { setname: "emacs:lookup", name: [lookup-el] }
- { setname: "emacs:mailcrypt", name: [mailcrypt] }
- { setname: "emacs:markdown-mode", name: [emacs-markdown-mode,markdown-mode,markdown-mode.el] }
- { setname: "emacs:matlab", name: [emacs-matlab] }
- { setname: "emacs:mew", name: [emacs-mew,mew] }
- { setname: "emacs:mew", name: mew-beta, weak_devel: true }
- { setname: "emacs:mmm-mode", name: emacs-mmm-mode }
- { setname: "emacs:mpg123", name: [emacs-mpg123,"emacs:mpg123-el", mpg123-el, mpg123.el] }
- { setname: "emacs:mu-cite", name: [mu-cute] }
- { setname: "emacs:multiple-cursors", name: [emacs-multiple-cursors] }
- { setname: "emacs:muse", name: [emacs-muse, emacs-muse-mode, muse-el] }
- { setname: "emacs:navi2ch", name: [emacs-navi2ch,navi2ch] }
- { setname: "emacs:org-mode", name: [emacs-org,emacs-org-mode,org-mode] }
- { setname: "emacs:php-mode", name: [emacs-php-mode,php-mode.el,php-elisp] }
- { setname: "emacs:psgml", name: [psgml, emacs-psgml, emacs-mode-psgml, psgml-mode] }
- { setname: "emacs:python-mode", name: [emacs-python-mode,python-mode.el,python-mode] }
- { setname: "emacs:queue", name: [emacs-queue,queue-el] }
- { setname: "emacs:rfcview", name: [emacs-rfcview] }
- { setname: "emacs:riece", name: [riece] }
- { setname: "emacs:rust-mode", name: [emacs-rust-mode,elpa-rust-mode] }
- { setname: "emacs:session", name: [emacs-session] }
- { setname: "emacs:sml-mode", name: [emacs-sml-mode,sml-mode,sml-mode.el] }
- { setname: "emacs:tdtd", name: [emacs-mode-tdtd] }
- { setname: "emacs:undo-tree", name: [emacs-undo-tree, elpa-undo-tree] }
2 changes: 2 additions & 0 deletions 900.version-fixes/e.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
- { name: elm-format, verpat: "(.*?)[_-]?(?:alpha|exp)", setver: $1, devel: true }
- { name: elvis, verpat: "20[0-9]{6}", snapshot: true }
- { name: elvis, ver: "2.2f", incorrect: true } # source file gone, cannot check
- { name: "emacs:icicles", noscheme: true }
- { name: "emacs:tdtd", ver: "0.71", incorrect: true } # sisyphus fake
- { name: emc2, verpat: "([0-9]+\\.[0-9]+)\\.([a-z]+)", setver: $1$2 }
- { name: emerald, ver: "0.9.5", outdated: true } # these come from https://launchpad.net/~nilarimogard/+archive/ubuntu/webupd8/+index?batch=75&memo=75&start=75 and these are older than latest 0.8.x releases
- { name: empathy, verpat: "[0-9]+\\.[0-9]*[13579]\\..*", devel: true }
Expand Down

0 comments on commit 734d93c

Please sign in to comment.