Merge branch 'develop' (v0.46.1)

core/spacemacs-mode.el

@@ -4,7 +4,7 @@
 (require 'subr-x nil 'noerror)
 (require 'emacs-backports)
 
-(defconst spacemacs-version "0.46.0"
+(defconst spacemacs-version "0.46.1"
   "Spacemacs version.")
 (defconst spacemacs-min-version "24.3"
   "Mininal required version of Emacs.")
@@ -292,7 +292,7 @@ found."
        (default-directory user-emacs-directory))
     (prog1
         (eq 0 (process-file "git" nil proc-buffer nil
-                            "fetch" "--tags" remote branch))
+                            "fetch" remote branch))
       (kill-buffer proc-buffer))))
 
 (defun spacemacs/git-latest-tag (remote branch)

spacemacs/extensions.el

@@ -19,6 +19,14 @@
     zoom-frm
     ))
 
+;; use the last 24.3 compatible version of paradox as
+;; an extension.
+;; There is no corresponding init-paradox function here
+;; the init-paradox from packages.el will be called
+;; automatically.
+(when (version< emacs-version "24.4")
+    (push 'paradox spacemacs-post-extensions))
+
 ;; Initialize the extensions
 
 (defun spacemacs/init-centered-cursor ()

spacemacs/extensions/paradox/README.md

@@ -0,0 +1,103 @@
+Paradox
+=======
+
+Project for modernizing Emacs' Package Menu. With package ratings,
+usage statistics, customizability, and more.
+
+Here are some visual comparisons:
+
+#### Regular Package Menu ####
+![Regular Package Menu](https://raw.github.com/Bruce-Connor/paradox/master/before.png)
+
+#### Paradox ####
+![Paradox Package Menu](https://raw.github.com/Bruce-Connor/paradox/master/after.png)
+
+#### Paradox (multi-line) ####
+![Paradox Package Menu](https://raw.github.com/Bruce-Connor/paradox/master/multi-line.png)  
+*These screenshots use smart-mode-line, but a similar effect is obtained with the regular mode-line.*
+
+Usage
+===
+
+Paradox can be installed from Melpa with `M-x package-install RET
+paradox`.  
+It can also be installed manually in the usual way, just be mindful of
+the dependencies.
+
+To use it, simply call `M-x paradox-list-packages` (instead of the
+regular `list-packages`).  
+This will give you most features out of the box. If you want to be
+able to star packages as well, just configure the
+`paradox-github-token` variable then call `paradox-list-packages`
+again.
+
+If you'd like to stop using Paradox, you may call `paradox-disable`
+and go back to using the regular `list-packages`.
+
+## Current Features ##
+
+### Several Improvements ###
+
+Paradox implements many small improvements to the package menu
+itself. They all work out of the box and are completely customizable!  
+*(Also, hit `h` to see all keys.)*
+
+* Visit the package's homepage with `v` (or just use the provided buttons).
+* View a list of recent commits with `l`.
+* Use `paradox-require` instead of `require` to automatically install
+  absent packages.
+* Shortcuts for package filtering:
+    * `f r` filters by regexp (`occur`);
+    * `f u` display only packages with upgrades;
+    * `f k` filters by keyword (emacs 24.4 only).
+
+And some more...
+* `hl-line-mode` enabled by default.
+* Display useful information on the mode-line and cleanup a bunch of
+  useless stuff.
+* **Customization!** Just call `M-x paradox-customize` to see what you can
+  do.
+    * Customize column widths.
+    * Customize faces (`paradox-star-face`,
+      `paradox-status-face-alist` and `paradox-archive-face`).
+    * Customize local variables.
+
+
+### Package Ratings ###
+
+Paradox also integrates with
+**GitHub Stars**, which works as **rough** package rating system.  
+That is, Paradox package menu will:
+
+1. Display the number of GitHub Stars each package has (assuming it's
+   in a github repo, of course);
+2. Possibly automatically star packages you install, and unstar
+   packages you delete (you will be asked the first time whether you
+   want this);
+3. Let you star and unstar packages by hitting the `s` key;
+4. Let you star all packages you have installed with `M-x paradox-star-all-installed-packages`.
+
+Item **1.** will work out of the box, the other items obviously
+require a github account (Paradox will help you generate a token the
+first time you call `paradox-list-packages`).
+
+## Known Bugs ##
+
+* On some cases there's an annoying gnutls error message after downloading the star counts `gnutls.c: [0] (Emacs) fatal error: The TLS connection was non-properly terminated.`.  
+  If anyone knows how to fix it, I'm all ears.
+
+## How Star Displaying Works ##
+
+We generate a map of `Package Name -> Repository` from
+[Melpa](https://github.com/milkypostman/melpa.git)'s `recipe`
+directory, some repos may correspond to more than one package. 
+This map is used count the stars a given package has.
+_This doesn't mean you need Melpa to see the star counts, the numbers
+will be displayed regardless of what archives you use._
+
+Currently, packages that are not hosted on GitHub are listed with a
+blank star count, which is clearly different from 0-star packages
+(which are displayed with a 0, obviously).  
+If you know of an alternative that could be used for these packages,
+[open an issue](https://github.com/Bruce-Connor/paradox/issues/new)
+here, I'd love to hear.

spacemacs/extensions/paradox/paradox-compat.el

@@ -0,0 +1,212 @@
+;;; paradox-compat.el --- Compatibility functions for using paradox with emacs < 24.4
+
+;; Copyright (C) 2014 Artur Malabarba <[email protected]>
+
+;; Author: Artur Malabarba <[email protected]>
+;; URL: http://github.com/Bruce-Connor/paradox
+;; Version: 1.0.1
+;; Keywords: package packages mode-line
+;; Package-Requires: ((emacs "24.1") (tabulated-list "1.0") (package "1.0") (json "1.4"))
+;; Prefix: paradox 
+;; Separator: -
+
+;;; License:
+;;
+;; This file is NOT part of GNU Emacs.
+;;
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License
+;; as published by the Free Software Foundation; either version 2
+;; 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.
+;; 
+
+;;; Code:
+
+(eval-when-compile (require 'package))
+;; (require 'json)
+;; (require 'cl)
+
+(defun paradox--print-info-compat (pkg)
+  "Return a package entry suitable for `tabulated-list-entries' (package-1.0 version).
+PKG has the form ((PACKAGE . VERSION) STATUS DOC).
+Return (KEY [NAME VERSION STATUS DOC]), where KEY is the
+identifier (NAME . VERSION-LIST)."
+  (let* ((package (caar pkg))
+         (version (cdr (car pkg)))
+         (status  (nth 1 pkg))
+         (doc (or (nth 2 pkg) ""))
+         (face (or (cdr (assoc-string status paradox-status-face-alist))
+                   'font-lock-warning-face))
+         (url (paradox--package-homepage package))
+         (name (symbol-name package))
+         (name-length (length name))
+         (button-length (length paradox-homepage-button-string)))
+    (paradox--incf status)
+    (list (cons package version)
+          (vconcat
+           (append (list (concat 
+                          (propertize name
+                                      'face 'paradox-name-face
+                                      'button t
+                                      'follow-link t
+                                      'package-symbol package
+                                      'help-echo (format "Package: %s" name)
+                                      'action 'package-menu-describe-package)
+                          (if (and paradox-use-homepage-buttons url
+                                   (< (+ name-length button-length) paradox-column-width-package))
+                              (concat
+                               (make-string (- paradox-column-width-package name-length button-length) ?\s)
+                               (propertize paradox-homepage-button-string
+                                           'face 'paradox-homepage-button-face
+                                           'mouse-face 'custom-button-mouse
+                                           'help-echo (format "Visit %s" url)
+                                           'button t
+                                           'follow-link t
+                                           'action 'paradox-menu-visit-homepage))
+                            ""))
+                         (propertize (package-version-join version)
+                                     'font-lock-face face)
+                         (propertize status 'font-lock-face face))
+                   (paradox--count-print package)
+                   (list 
+                    (propertize (concat desc-prefix doc desc-suffix)
+                                'font-lock-face
+                                (if (> paradox-lines-per-entry 1)
+                                    'paradox-description-face-multiline
+                                  'paradox-description-face))))))))
+
+(defun paradox--print-entry-compat (id cols)
+  "Printer used by `paradox-menu-mode'.
+Just like default printer, except columns are printed with
+`paradox--print-col-compat'."
+  (let ((beg   (point))
+	(x     (max tabulated-list-padding 0))
+	(ncols (length tabulated-list-format))
+	(inhibit-read-only t))
+    (if (> tabulated-list-padding 0)
+	(insert (make-string x ?\s)))
+    (dotimes (n ncols)
+      (setq x (paradox--print-col-compat n (aref cols n) x)))
+    (insert ?\n)
+    (put-text-property beg (point) 'tabulated-list-id id)
+    (put-text-property beg (point) 'tabulated-list-entry cols)))
+
+(defun paradox--print-col-compat (n col-desc x)
+  "Insert a specified Tabulated List entry at point.
+N is the column number, COL-DESC is a column descriptor \(see
+`tabulated-list-entries'), and X is the column number at point.
+Return the column number after insertion.
+
+This is like `tabulated-list-print-col', except the help-echo
+property is respected."
+  ;; TODO: don't truncate to `width' if the next column is align-right
+  ;; and has some space left.
+  (let* ((format    (aref tabulated-list-format n))
+	 (name      (nth 0 format))
+	 (width     (nth 1 format))
+	 (props     (nthcdr 3 format))
+	 (pad-right (or (plist-get props :pad-right) 1))
+         (right-align (plist-get props :right-align))
+	 (label     (if (stringp col-desc) col-desc (car col-desc)))
+         (label-width (string-width label))
+	 (help-echo (concat (car format) ": " label))
+	 (opoint (point))
+	 (not-last-col (< (1+ n) (length tabulated-list-format))))
+    ;; Truncate labels if necessary (except last column).
+    (and not-last-col
+	 (> label-width width)
+	 (setq label (truncate-string-to-width label width nil nil t)
+               label-width width))
+    (setq label (bidi-string-mark-left-to-right label))
+    (when (and right-align (> width label-width))
+      (let ((shift (- width label-width)))
+        (insert (propertize (make-string shift ?\s)
+                            'display `(space :align-to ,(+ x shift))))
+        (setq width (- width shift))
+        (setq x (+ x shift))))
+    (if (stringp col-desc)
+	(insert (if (get-text-property 0 'help-echo label)
+		    label
+		  (propertize label 'help-echo help-echo)))
+      (apply 'insert-text-button label (cdr col-desc)))
+    (let ((next-x (+ x pad-right width)))
+      ;; No need to append any spaces if this is the last column.
+      (when not-last-col
+        (when (> pad-right 0) (insert (make-string pad-right ?\s)))
+        (insert (propertize
+                 (make-string (- next-x x label-width pad-right) ?\s)
+                 'display `(space :align-to ,next-x))))
+      (put-text-property opoint (point) 'tabulated-list-column-name name)
+      next-x)))
+
+(defun paradox--package-homepage (pkg)
+  "PKG is just the symbol that identifies the package."
+  (let ((extras (elt (cdr-safe (assoc pkg package-archive-contents)) 4)))
+    (and (listp extras) (cdr-safe (assoc :url extras)))))
+
+(defmacro package--push-compat (package desc status listname)
+  "Convenience macro for `package-menu--generate'.
+If the alist stored in the symbol LISTNAME lacks an entry for a
+package PACKAGE with descriptor DESC, add one.  The alist is
+keyed with cons cells (PACKAGE . VERSION-LIST), where PACKAGE is
+a symbol and VERSION-LIST is a version list."
+  `(let* ((version (package-desc-vers ,desc))
+          (key (cons ,package version)))
+     (unless (assoc key ,listname)
+       (push (list key ,status (package-desc-doc ,desc)) ,listname))))
+
+(defun paradox-menu--refresh (packages &optional keywords)
+  ;; Construct list of ((PACKAGE . VERSION) STATUS DESCRIPTION).
+  (let (info-list name)
+    ;; Installed packages:
+    (dolist (elt package-alist)
+      (setq name (car elt))
+      (when (or (eq packages t) (memq name packages))
+        (package--push-compat name (cdr elt)
+                       (if (stringp (cadr (assq name package-load-list)))
+                           "held" "installed")
+                       info-list)))
+
+    ;; Built-in packages:
+    (dolist (elt package--builtins)
+      (setq name (car elt))
+      (when (and (not (eq name 'emacs)) ; Hide the `emacs' package.
+                 (or (eq packages t) (memq name packages)))
+        (package--push-compat name (cdr elt) "built-in" info-list)))
+
+    ;; Available and disabled packages:
+    (dolist (elt package-archive-contents)
+      (setq name (car elt))
+      (when (or (eq packages t) (memq name packages))
+        (let ((hold (assq name package-load-list)))
+          (package--push-compat name (cdr elt)
+                         (cond
+                          ((and hold (null (cadr hold))) "disabled")
+                          ((memq name package-menu--new-package-list) "new")
+                          (t "available"))
+                         info-list))))
+
+    ;; Obsolete packages:
+    (dolist (elt package-obsolete-alist)
+      (dolist (inner-elt (cdr elt))
+        (when (or (eq packages t) (memq (car elt) packages))
+          (package--push-compat (car elt) (cdr inner-elt) "obsolete" info-list))))
+
+    ;; Print the result.
+    (setq tabulated-list-entries (mapcar 'package-menu--print-info info-list))
+    (tabulated-list-print remember-pos)))
+
+(defun paradox--get-or-return-package (pkg)
+  (if (or (markerp pkg) (null pkg))
+      (if (derived-mode-p 'package-menu-mode)
+          (car (tabulated-list-get-id))
+        (error "Not in Package Menu."))
+    pkg))
+
+(provide 'paradox-compat)
+;;; paradox-compat.el ends here.