Merge remote-tracking branch 'upstream/master'

2025-03-07 04:45:08 -10:00 · 2012-06-24 19:22:49 +03:00 · 2012-06-24 19:22:49 +03:00 · b0e95801bd
commit b0e95801bd
parent d065b30eaa 5e725582bc
60 changed files with 120 additions and 19 deletions
--- a/html/index.erb
+++ b/html/index.erb
@ -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)).

--- a/html/template.html
+++ b/html/template.html
@ -48,7 +48,7 @@ $for(header-includes)$
 $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$
--- a/7
+++ b/7
@ -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
--- a/package-build.el
+++ b/package-build.el
@ -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
--- a/recipes/ack-and-a-half
+++ b/recipes/ack-and-a-half
@ -1,2 +1 @@
 (ack-and-a-half :repo "jhelwig/ack-and-a-half" :fetcher github)
-
--- a/recipes/auto-complete-clang
+++ b/recipes/auto-complete-clang
@ -0,0 +1,3 @@
+(auto-complete-clang
+ :repo "brianjcj/auto-complete-clang"
+ :fetcher github)
--- a/recipes/auto-shell-command
+++ b/recipes/auto-shell-command
@ -0,0 +1 @@
+(auto-shell-command :repo "ongaeshi/auto-shell-command" :fetcher github)
--- a/recipes/bundler
+++ b/recipes/bundler
@ -0,0 +1 @@
+(bundler :repo "tobiassvn/bundler.el" :fetcher github)
--- a/recipes/calfw
+++ b/recipes/calfw
@ -0,0 +1,3 @@
+(calfw :repo "kiwanami/emacs-calfw"
+       :fetcher github
+       :files ("*.el"))
--- a/recipes/color-theme
+++ b/recipes/color-theme
@ -0,0 +1 @@
+(color-theme :url "http://bzr.savannah.gnu.org/r/color-theme/trunk" :fetcher bzr)
--- a/recipes/color-theme-solarized
+++ b/recipes/color-theme-solarized
@ -0,0 +1 @@
+(color-theme-solarized :repo "sellout/emacs-color-theme-solarized" :fetcher github)
--- a/recipes/csharp-mode
+++ b/recipes/csharp-mode
@ -0,0 +1,2 @@
+(csharp-mode
+ :fetcher wiki)
--- a/recipes/deferred
+++ b/recipes/deferred
@ -0,0 +1,4 @@
+(deferred
+  :repo "kiwanami/emacs-deferred"
+  :fetcher github
+  :files ("deferred.el"))
--- a/recipes/duplicate-thing
+++ b/recipes/duplicate-thing
@ -0,0 +1 @@
+(duplicate-thing :repo "ongaeshi/duplicate-thing" :fetcher github)
--- a/recipes/e2wm
+++ b/recipes/e2wm
@ -0,0 +1,3 @@
+(e2wm :repo "kiwanami/emacs-window-manager" 
+      :fetcher github 
+      :files ("e2wm.el" "e2wm-vcs.el"))
--- a/recipes/etags-table
+++ b/recipes/etags-table
@ -0,0 +1,2 @@
+(etags-table
+ :fetcher wiki)
--- a/recipes/flex-isearch
+++ b/recipes/flex-isearch
@ -0,0 +1,3 @@
+(flex-isearch
+ :fetcher hg
+ :url "https://bitbucket.org/jpkotta/flex-isearch")
--- a/recipes/glsl-mode
+++ b/recipes/glsl-mode
@ -0,0 +1,3 @@
+(glsl-mode
+ :repo "jimhourihan/glsl-mode"
+ :fetcher github)
--- a/recipes/go-mode
+++ b/recipes/go-mode
@ -0,0 +1,4 @@
+(go-mode
+ :url "https://code.google.com/p/go/"
+ :fetcher hg
+ :files ("misc/emacs/*.el"))
--- a/recipes/guru-mode
+++ b/recipes/guru-mode
@ -0,0 +1,3 @@
+(guru-mode :repo "bbatsov/guru-mode"
+           :fetcher github
+           :files ("guru-mode.el"))
--- a/recipes/helm-R
+++ b/recipes/helm-R
@ -0,0 +1,3 @@
+(helm-R :repo "myuhe/anything-R.el" 
+        :fetcher github 
+        :files ("helm-R.el"))
--- a/recipes/htmlize
+++ b/recipes/htmlize
@ -0,0 +1,3 @@
+(htmlize
+ :url "http://fly.srk.fer.hr/~hniksic/emacs/htmlize.git"
+ :fetcher git)
--- a/recipes/iedit
+++ b/recipes/iedit
@ -0,0 +1 @@
+(iedit :fetcher wiki)
--- a/recipes/info+
+++ b/recipes/info+
@ -0,0 +1 @@
+(info+ :fetcher wiki)
--- a/recipes/initsplit
+++ b/recipes/initsplit
@ -0,0 +1 @@
+(initsplit :fetcher github :repo "dabrahams/initsplit" :files ("initsplit.el"))
--- a/recipes/inlineR
+++ b/recipes/inlineR
@ -0,0 +1,3 @@
+(inlineR :repo "myuhe/inlineR.el" 
+         :fetcher github 
+         :files ("inlineR.el"))
--- a/recipes/ir-black-theme
+++ b/recipes/ir-black-theme
@ -0,0 +1 @@
+(ir-black-theme :repo "jmdeldin/ir-black-theme.el" :fetcher github)
--- a/recipes/isearch+
+++ b/recipes/isearch+
@ -0,0 +1,2 @@
+(isearch+
+ :fetcher wiki)
--- a/recipes/jinja2-mode
+++ b/recipes/jinja2-mode
@ -0,0 +1 @@
+(jinja2-mode :fetcher github :repo "paradoxxxzero/jinja2-mode")
--- a/recipes/linum-relative
+++ b/recipes/linum-relative
@ -0,0 +1 @@
+(linum-relative :fetcher wiki)
--- a/recipes/logalimacs
+++ b/recipes/logalimacs
@ -0,0 +1,3 @@
+(logalimacs :repo "logaling/logalimacs"
+            :fetcher github
+            :files ("logalimacs.el"))
--- a/recipes/mark-multiple
+++ b/recipes/mark-multiple
@ -0,0 +1,3 @@
+(mark-multiple
+ :fetcher github
+ :repo "magnars/mark-multiple.el")
--- a/recipes/modeline-posn
+++ b/recipes/modeline-posn
@ -0,0 +1,2 @@
+(modeline-posn
+ :fetcher wiki)
--- a/recipes/mouse+
+++ b/recipes/mouse+
@ -0,0 +1,2 @@
+(mouse+
+ :fetcher wiki)
--- a/recipes/multi-eshell
+++ b/recipes/multi-eshell
@ -0,0 +1 @@
+(multi-eshell :fetcher wiki)
--- a/recipes/org-jekyll
+++ b/recipes/org-jekyll
@ -0,0 +1,3 @@
+(org-jekyll :repo "juanre/org-jekyll"
+            :fetcher github
+            :files ("org-jekyll.el"))
--- a/recipes/php+-mode
+++ b/recipes/php+-mode
@ -0,0 +1,4 @@
+(php+-mode
+ :fetcher github
+ :repo "echosa/phpplus-mode"
+ :files ("*.el"))
--- a/recipes/pony-mode
+++ b/recipes/pony-mode
@ -1,4 +1,4 @@
 (pony-mode
 :repo "davidmiller/pony-mode"
 :fetcher github
- :files ("src/*.el" "snippets"))
+ :files ("src/*.el" "src/snippets"))
--- a/recipes/popwin
+++ b/recipes/popwin
@ -0,0 +1 @@
+(popwin :fetcher github :repo "m2ym/popwin-el")
--- a/recipes/prelude-erlang
+++ b/recipes/prelude-erlang
@ -0,0 +1 @@
+(prelude-erlang :repo "bbatsov/prelude-modules" :fetcher github :files ("prelude-erlang.el"))
--- a/recipes/prelude-python
+++ b/recipes/prelude-python
@ -0,0 +1 @@
+(prelude-python :repo "bbatsov/prelude-modules" :fetcher github :files ("prelude-python.el"))
--- a/recipes/pretty-symbols-mode
+++ b/recipes/pretty-symbols-mode
@ -0,0 +1 @@
+(pretty-symbols-mode :repo "drothlis/pretty-symbols" :fetcher github)
--- a/recipes/quickrun
+++ b/recipes/quickrun
@ -0,0 +1,4 @@
+(quickrun
+ :repo "syohex/emacs-quickrun"
+ :fetcher github
+ :files ("quickrun.el"))
--- a/recipes/revive
+++ b/recipes/revive
@ -0,0 +1 @@
+(revive :fetcher github :repo "emacsmirror/revive")
--- a/recipes/sauron
+++ b/recipes/sauron
@ -0,0 +1 @@
+(sauron :repo "djcb/sauron" :fetcher github)
--- a/recipes/save-visited-files
+++ b/recipes/save-visited-files
@ -0,0 +1,3 @@
+(save-visited-files
+ :fetcher github
+ :repo "nflath/save-visited-files")
--- a/recipes/scala-mode
+++ b/recipes/scala-mode
@ -0,0 +1,4 @@
+(scala-mode
+ :repo "scala/scala-dist"
+ :fetcher github
+ :files ("tool-support/src/emacs/*.el"))
--- a/recipes/scratch-log
+++ b/recipes/scratch-log
@ -0,0 +1,4 @@
+(scratch-log :repo "wakaran/scratch-log"
+      :fetcher github
+      :files ("scratch-log.el"))
+
--- a/recipes/smart-mode-line
+++ b/recipes/smart-mode-line
@ -0,0 +1 @@
+(smart-mode-line :repo "Bruce-Connor/smart-mode-line" :fetcher github)
--- a/recipes/sunrise-commander
+++ b/recipes/sunrise-commander
@ -0,0 +1 @@
+(sunrise-commander :fetcher github :repo "escherdragon/sunrise-commander")
--- a/recipes/switch-window
+++ b/recipes/switch-window
@ -0,0 +1 @@
+(switch-window :repo "dimitri/switch-window" :fetcher github)
--- a/recipes/textmate
+++ b/recipes/textmate
@ -0,0 +1 @@
+(textmate :repo "defunkt/textmate.el" :fetcher github)
--- a/recipes/underwater-theme.el
+++ b/recipes/underwater-theme.el
@ -0,0 +1 @@
+(underwater-theme :repo "jmdeldin/underwater-theme.el" :fetcher github)
--- a/recipes/unfill
+++ b/recipes/unfill
@ -0,0 +1 @@
+(unfill :fetcher github :repo "purcell/unfill")
--- a/recipes/wgrep
+++ b/recipes/wgrep
@ -0,0 +1,3 @@
+(wgrep
+ :fetcher github
+ :repo "mhayashi1120/Emacs-wgrep")
--- a/recipes/window-layout
+++ b/recipes/window-layout
@ -0,0 +1,3 @@
+(window-layout :repo "kiwanami/emacs-window-layout"
+      :fetcher github
+      :files ("window-layout.el"))
--- a/recipes/workgroups
+++ b/recipes/workgroups
@ -0,0 +1 @@
+(workgroups :repo "tlh/workgroups.el" :fetcher github)
--- a/recipes/zen-and-art-theme
+++ b/recipes/zen-and-art-theme
@ -0,0 +1 @@
+(zen-and-art-theme :repo "developernotes/zen-and-art-theme" :fetcher github)
--- a/recipes/zencoding-mode
+++ b/recipes/zencoding-mode
@ -0,0 +1 @@
+(zencoding-mode :repo "rooney/zencoding" :fetcher github)
--- a/recipes/zf-mode
+++ b/recipes/zf-mode
@ -1,4 +0,0 @@
-(zf-mode
- :fetcher github
- :repo "echosa/zf-mode"
- :files ("*.el" "ZFMode" "bundled"))
				`@ -1,2 +1 @@`
				`(ack-and-a-half :repo "jhelwig/ack-and-a-half" :fetcher github)`
				`@ -0,0 +1 @@`
				`(auto-shell-command :repo "ongaeshi/auto-shell-command" :fetcher github)`
				`@ -0,0 +1 @@`
				`(bundler :repo "tobiassvn/bundler.el" :fetcher github)`
				`@ -0,0 +1 @@`
				`(color-theme :url "http://bzr.savannah.gnu.org/r/color-theme/trunk" :fetcher bzr)`
				`@ -0,0 +1 @@`
				`(color-theme-solarized :repo "sellout/emacs-color-theme-solarized" :fetcher github)`
				`@ -0,0 +1 @@`
				`(duplicate-thing :repo "ongaeshi/duplicate-thing" :fetcher github)`
				`@ -0,0 +1 @@`
				`(initsplit :fetcher github :repo "dabrahams/initsplit" :files ("initsplit.el"))`
				`@ -0,0 +1 @@`
				`(ir-black-theme :repo "jmdeldin/ir-black-theme.el" :fetcher github)`
				`@ -0,0 +1 @@`
				`(jinja2-mode :fetcher github :repo "paradoxxxzero/jinja2-mode")`
				`@ -0,0 +1 @@`
				`(popwin :fetcher github :repo "m2ym/popwin-el")`