Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge remote-tracking branch 'upstream/master'

  • Loading branch information...
commit b0e95801bdecce8e8e09c962834e70ba762da517 2 parents d065b30 + 5e72558
Andrey Kotlarski m00natic authored
Showing with 120 additions and 19 deletions.
  1. +2 −5 html/index.erb
  2. +1 −1  html/template.html
  3. +2 −5 melpa
  4. +8 −2 package-build.el
  5. +0 −1  recipes/ack-and-a-half
  6. +3 −0  recipes/auto-complete-clang
  7. +1 −0  recipes/auto-shell-command
  8. +1 −0  recipes/bundler
  9. +3 −0  recipes/calfw
  10. +1 −0  recipes/color-theme
  11. +1 −0  recipes/color-theme-solarized
  12. +2 −0  recipes/csharp-mode
  13. +4 −0 recipes/deferred
  14. +1 −0  recipes/duplicate-thing
  15. +3 −0  recipes/e2wm
  16. +2 −0  recipes/etags-table
  17. +3 −0  recipes/flex-isearch
  18. +3 −0  recipes/glsl-mode
  19. +4 −0 recipes/go-mode
  20. +3 −0  recipes/guru-mode
  21. +3 −0  recipes/helm-R
  22. +3 −0  recipes/htmlize
  23. +1 −0  recipes/iedit
  24. +1 −0  recipes/info+
  25. +1 −0  recipes/initsplit
  26. +3 −0  recipes/inlineR
  27. +1 −0  recipes/ir-black-theme
  28. +2 −0  recipes/isearch+
  29. +1 −0  recipes/jinja2-mode
  30. +1 −0  recipes/linum-relative
  31. +3 −0  recipes/logalimacs
  32. +3 −0  recipes/mark-multiple
  33. +2 −0  recipes/modeline-posn
  34. +2 −0  recipes/mouse+
  35. +1 −0  recipes/multi-eshell
  36. +3 −0  recipes/org-jekyll
  37. +4 −0 recipes/php+-mode
  38. +1 −1  recipes/pony-mode
  39. +1 −0  recipes/popwin
  40. +1 −0  recipes/prelude-erlang
  41. +1 −0  recipes/prelude-python
  42. +1 −0  recipes/pretty-symbols-mode
  43. +4 −0 recipes/quickrun
  44. +1 −0  recipes/revive
  45. +1 −0  recipes/sauron
  46. +3 −0  recipes/save-visited-files
  47. +4 −0 recipes/scala-mode
  48. +4 −0 recipes/scratch-log
  49. +1 −0  recipes/smart-mode-line
  50. +1 −0  recipes/sunrise-commander
  51. +1 −0  recipes/switch-window
  52. +1 −0  recipes/textmate
  53. +1 −0  recipes/underwater-theme.el
  54. +1 −0  recipes/unfill
  55. +3 −0  recipes/wgrep
  56. +3 −0  recipes/window-layout
  57. +1 −0  recipes/workgroups
  58. +1 −0  recipes/zen-and-art-theme
  59. +1 −0  recipes/zencoding-mode
  60. +0 −4 recipes/zf-mode
7 html/index.erb
View
@@ -10,8 +10,6 @@
**Last Update:** *<%= Time.now.strftime("%Y.%m.%d %H:%M %z") %>*
-## Current List of Packages
-
<%
def parse str
# credit to: http://stackoverflow.com/q/3128406/154508
@@ -37,10 +35,8 @@
headers = ["Package", "Version", "Description", "Source"]
-
data = parse(File.open("../packages/archive-contents").read)[1..-1]
-
data.map! do |row|
pkgname = row[0]
pkgurl = "packages/#{row[0]}-#{row[1]}." + (row[-1] == "single" ? "el" : "tar")
@@ -61,6 +57,7 @@
end
end
%>
+<%= "## Current List of #{data.size} Packages" %>
<%=
headers.to_enum(:each_with_index).map{
|h,i| h + " "*(colwidth[i]-h.length) }.join(" ")
@@ -170,7 +167,7 @@ If you are not using Emacs24 from HEAD, you may also need this to initialize pac
## Updating Packages
-`package.el` now includes a mechanism to upgrade packages. After running `package-list-pacages`, type *u* (mark Upgradable packages) and then *x* (eXecute the installs and deletions). When it's done installing all the packages it will ask if you want to delete the obsolete packages and so you can hit *y* (Yes).
+`package.el` now includes a mechanism to upgrade packages. After running `package-list-packages`, type *u* (mark Upgradable packages) and then *x* (eXecute the installs and deletions). When it's done installing all the packages it will ask if you want to delete the obsolete packages and so you can hit *y* (Yes).
If you run into a problem installing or upgrading, you may need to go into your `~/.emacs.d/elpa/` directory and delete packages that are installed multiple times. This can happen when the install times out (see [Known Issues](#known-issues)).
2  html/template.html
View
@@ -48,7 +48,7 @@
$endfor$
</head>
<body>
- <a href="http://github.com/milkypostman/melpa"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://a248.e.akamai.net/assets.github.com/img/71eeaab9d563c2b3c590319b398dd35683265e85/687474703a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f677261795f3664366436642e706e67" alt="Fork me on GitHub"></a>
+<a href="https://github.com/milkypostman/melpa"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png" alt="Fork me on GitHub"></a>
<div id="container">
$for(include-before)$
$include-before$
7 melpa
View
@@ -6,7 +6,6 @@ cd ${BASEDIR} || exit 1
function melpa_clear_packages {
- echo "*** Clearing the packages folder..."
date
rm -rf packages/*
echo
@@ -14,15 +13,13 @@ function melpa_clear_packages {
function melpa_build_pkglist {
- echo "*** Building all packages..."
- date
+ echo "*** `date` -- Building all packages..."
emacs --batch -l package-build.el --eval "(package-build-all)"
echo
}
function melpa_generate_html {
- echo "*** Building html..."
- date
+ echo "*** `date` -- Building html..."
cd html || return 1
erb index.erb > index.md
pandoc --template=template.html --css=style.css -s --mathml -t html --smart index.md > index.html
10 package-build.el
View
@@ -407,7 +407,7 @@ The file is written to `package-build-working-dir'."
If PKG-INFO is nil, an empty one is created."
(let* ((merged (or (copy-seq pkg-info)
(vector name nil "No description available." version))))
- (aset merged 0 (downcase name))
+ (aset merged 0 name)
(aset merged 2 (format "%s [source: %s]"
(aref merged 2) (plist-get config :fetcher)))
(aset merged 3 version)
@@ -585,7 +585,7 @@ FILES is a list of (SOURCE . DEST) relative filepath pairs."
(expand-file-name
(concat file-name "-" version ".tar") package-build-archive-dir)
pkg-dir
- (append (mapcar 'cdr files) (list pkg-file)))
+ (delete-dups (append (mapcar 'cdr files) (list pkg-file))))
(delete-directory pkg-dir t nil)
(pb/add-to-archive-contents pkg-info 'tar)))
@@ -643,4 +643,10 @@ FILES is a list of (SOURCE . DEST) relative filepath pairs."
(package-build-initialize)
(provide 'package-build)
+
+;; Local Variables:
+;; coding: utf-8
+;; eval: (checkdoc-minor-mode 1)
+;; End:
+
;;; package-build.el ends here
1  recipes/ack-and-a-half
View
@@ -1,2 +1 @@
(ack-and-a-half :repo "jhelwig/ack-and-a-half" :fetcher github)
-
3  recipes/auto-complete-clang
View
@@ -0,0 +1,3 @@
+(auto-complete-clang
+ :repo "brianjcj/auto-complete-clang"
+ :fetcher github)
1  recipes/auto-shell-command
View
@@ -0,0 +1 @@
+(auto-shell-command :repo "ongaeshi/auto-shell-command" :fetcher github)
1  recipes/bundler
View
@@ -0,0 +1 @@
+(bundler :repo "tobiassvn/bundler.el" :fetcher github)
3  recipes/calfw
View
@@ -0,0 +1,3 @@
+(calfw :repo "kiwanami/emacs-calfw"
+ :fetcher github
+ :files ("*.el"))
1  recipes/color-theme
View
@@ -0,0 +1 @@
+(color-theme :url "http://bzr.savannah.gnu.org/r/color-theme/trunk" :fetcher bzr)
1  recipes/color-theme-solarized
View
@@ -0,0 +1 @@
+(color-theme-solarized :repo "sellout/emacs-color-theme-solarized" :fetcher github)
2  recipes/csharp-mode
View
@@ -0,0 +1,2 @@
+(csharp-mode
+ :fetcher wiki)
4 recipes/deferred
View
@@ -0,0 +1,4 @@
+(deferred
+ :repo "kiwanami/emacs-deferred"
+ :fetcher github
+ :files ("deferred.el"))
1  recipes/duplicate-thing
View
@@ -0,0 +1 @@
+(duplicate-thing :repo "ongaeshi/duplicate-thing" :fetcher github)
3  recipes/e2wm
View
@@ -0,0 +1,3 @@
+(e2wm :repo "kiwanami/emacs-window-manager"
+ :fetcher github
+ :files ("e2wm.el" "e2wm-vcs.el"))
2  recipes/etags-table
View
@@ -0,0 +1,2 @@
+(etags-table
+ :fetcher wiki)
3  recipes/flex-isearch
View
@@ -0,0 +1,3 @@
+(flex-isearch
+ :fetcher hg
+ :url "https://bitbucket.org/jpkotta/flex-isearch")
3  recipes/glsl-mode
View
@@ -0,0 +1,3 @@
+(glsl-mode
+ :repo "jimhourihan/glsl-mode"
+ :fetcher github)
4 recipes/go-mode
View
@@ -0,0 +1,4 @@
+(go-mode
+ :url "https://code.google.com/p/go/"
+ :fetcher hg
+ :files ("misc/emacs/*.el"))
3  recipes/guru-mode
View
@@ -0,0 +1,3 @@
+(guru-mode :repo "bbatsov/guru-mode"
+ :fetcher github
+ :files ("guru-mode.el"))
3  recipes/helm-R
View
@@ -0,0 +1,3 @@
+(helm-R :repo "myuhe/anything-R.el"
+ :fetcher github
+ :files ("helm-R.el"))
3  recipes/htmlize
View
@@ -0,0 +1,3 @@
+(htmlize
+ :url "http://fly.srk.fer.hr/~hniksic/emacs/htmlize.git"
+ :fetcher git)
1  recipes/iedit
View
@@ -0,0 +1 @@
+(iedit :fetcher wiki)
1  recipes/info+
View
@@ -0,0 +1 @@
+(info+ :fetcher wiki)
1  recipes/initsplit
View
@@ -0,0 +1 @@
+(initsplit :fetcher github :repo "dabrahams/initsplit" :files ("initsplit.el"))
3  recipes/inlineR
View
@@ -0,0 +1,3 @@
+(inlineR :repo "myuhe/inlineR.el"
+ :fetcher github
+ :files ("inlineR.el"))
1  recipes/ir-black-theme
View
@@ -0,0 +1 @@
+(ir-black-theme :repo "jmdeldin/ir-black-theme.el" :fetcher github)
2  recipes/isearch+
View
@@ -0,0 +1,2 @@
+(isearch+
+ :fetcher wiki)
1  recipes/jinja2-mode
View
@@ -0,0 +1 @@
+(jinja2-mode :fetcher github :repo "paradoxxxzero/jinja2-mode")
1  recipes/linum-relative
View
@@ -0,0 +1 @@
+(linum-relative :fetcher wiki)
3  recipes/logalimacs
View
@@ -0,0 +1,3 @@
+(logalimacs :repo "logaling/logalimacs"
+ :fetcher github
+ :files ("logalimacs.el"))
3  recipes/mark-multiple
View
@@ -0,0 +1,3 @@
+(mark-multiple
+ :fetcher github
+ :repo "magnars/mark-multiple.el")
2  recipes/modeline-posn
View
@@ -0,0 +1,2 @@
+(modeline-posn
+ :fetcher wiki)
2  recipes/mouse+
View
@@ -0,0 +1,2 @@
+(mouse+
+ :fetcher wiki)
1  recipes/multi-eshell
View
@@ -0,0 +1 @@
+(multi-eshell :fetcher wiki)
3  recipes/org-jekyll
View
@@ -0,0 +1,3 @@
+(org-jekyll :repo "juanre/org-jekyll"
+ :fetcher github
+ :files ("org-jekyll.el"))
4 recipes/php+-mode
View
@@ -0,0 +1,4 @@
+(php+-mode
+ :fetcher github
+ :repo "echosa/phpplus-mode"
+ :files ("*.el"))
2  recipes/pony-mode
View
@@ -1,4 +1,4 @@
(pony-mode
:repo "davidmiller/pony-mode"
:fetcher github
- :files ("src/*.el" "snippets"))
+ :files ("src/*.el" "src/snippets"))
1  recipes/popwin
View
@@ -0,0 +1 @@
+(popwin :fetcher github :repo "m2ym/popwin-el")
1  recipes/prelude-erlang
View
@@ -0,0 +1 @@
+(prelude-erlang :repo "bbatsov/prelude-modules" :fetcher github :files ("prelude-erlang.el"))
1  recipes/prelude-python
View
@@ -0,0 +1 @@
+(prelude-python :repo "bbatsov/prelude-modules" :fetcher github :files ("prelude-python.el"))
1  recipes/pretty-symbols-mode
View
@@ -0,0 +1 @@
+(pretty-symbols-mode :repo "drothlis/pretty-symbols" :fetcher github)
4 recipes/quickrun
View
@@ -0,0 +1,4 @@
+(quickrun
+ :repo "syohex/emacs-quickrun"
+ :fetcher github
+ :files ("quickrun.el"))
1  recipes/revive
View
@@ -0,0 +1 @@
+(revive :fetcher github :repo "emacsmirror/revive")
1  recipes/sauron
View
@@ -0,0 +1 @@
+(sauron :repo "djcb/sauron" :fetcher github)
3  recipes/save-visited-files
View
@@ -0,0 +1,3 @@
+(save-visited-files
+ :fetcher github
+ :repo "nflath/save-visited-files")
4 recipes/scala-mode
View
@@ -0,0 +1,4 @@
+(scala-mode
+ :repo "scala/scala-dist"
+ :fetcher github
+ :files ("tool-support/src/emacs/*.el"))
4 recipes/scratch-log
View
@@ -0,0 +1,4 @@
+(scratch-log :repo "wakaran/scratch-log"
+ :fetcher github
+ :files ("scratch-log.el"))
+
1  recipes/smart-mode-line
View
@@ -0,0 +1 @@
+(smart-mode-line :repo "Bruce-Connor/smart-mode-line" :fetcher github)
1  recipes/sunrise-commander
View
@@ -0,0 +1 @@
+(sunrise-commander :fetcher github :repo "escherdragon/sunrise-commander")
1  recipes/switch-window
View
@@ -0,0 +1 @@
+(switch-window :repo "dimitri/switch-window" :fetcher github)
1  recipes/textmate
View
@@ -0,0 +1 @@
+(textmate :repo "defunkt/textmate.el" :fetcher github)
1  recipes/underwater-theme.el
View
@@ -0,0 +1 @@
+(underwater-theme :repo "jmdeldin/underwater-theme.el" :fetcher github)
1  recipes/unfill
View
@@ -0,0 +1 @@
+(unfill :fetcher github :repo "purcell/unfill")
3  recipes/wgrep
View
@@ -0,0 +1,3 @@
+(wgrep
+ :fetcher github
+ :repo "mhayashi1120/Emacs-wgrep")
3  recipes/window-layout
View
@@ -0,0 +1,3 @@
+(window-layout :repo "kiwanami/emacs-window-layout"
+ :fetcher github
+ :files ("window-layout.el"))
1  recipes/workgroups
View
@@ -0,0 +1 @@
+(workgroups :repo "tlh/workgroups.el" :fetcher github)
1  recipes/zen-and-art-theme
View
@@ -0,0 +1 @@
+(zen-and-art-theme :repo "developernotes/zen-and-art-theme" :fetcher github)
1  recipes/zencoding-mode
View
@@ -0,0 +1 @@
+(zencoding-mode :repo "rooney/zencoding" :fetcher github)
4 recipes/zf-mode
View
@@ -1,4 +0,0 @@
-(zf-mode
- :fetcher github
- :repo "echosa/zf-mode"
- :files ("*.el" "ZFMode" "bundled"))
Please sign in to comment.
Something went wrong with that request. Please try again.