[elpa] master a1c9e99 3/3: Merge commit '6abd4f4fe740054d433d928d90fb1671cce6719c'

[Artur Malabarba]

branch: master
commit a1c9e99bb40cec84026ee23e368458ae9a0852bd
Merge: 8136370 6abd4f4
Author: Artur Malabarba <address@hidden>
Commit: Artur Malabarba <address@hidden>

    Merge commit '6abd4f4fe740054d433d928d90fb1671cce6719c'
---
 packages/nameless/README.org               |    9 +++++----
 packages/nameless/example-nameless-off.png |  Bin 33500 -> 0 bytes
 packages/nameless/example-nameless-on.png  |  Bin 26527 -> 0 bytes
 packages/nameless/example-nameless.png     |  Bin 0 -> 70945 bytes
 packages/nameless/nameless.el              |   11 +++++++----
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/packages/nameless/README.org b/packages/nameless/README.org
index d427342..12d5fe5 100644
--- a/packages/nameless/README.org
+++ b/packages/nameless/README.org
@@ -3,10 +3,11 @@
 * Nameless --- /less is more/
 *Hide package namespaces in your emacs-lisp code.*
 
-Simply put, turn on this minor mode, and you’ll see this
-[[file:example-nameless-on.png]]\\
-instead of this
-[[file:example-nameless-off.png]]
+Simply put, turn on this minor mode, and the namespace prefix of the
+package you’re editing will be hidden by a ~:~. Here’s a comparison.
+The image to the *left* is what you normally see. The image to
+the *right* has ~nameless-mode~ turned on.\\
+ [[file:example-nameless.png]]
 
 ** Usage
 
diff --git a/packages/nameless/example-nameless-off.png 
b/packages/nameless/example-nameless-off.png
deleted file mode 100644
index a4bbcda..0000000
Binary files a/packages/nameless/example-nameless-off.png and /dev/null differ
diff --git a/packages/nameless/example-nameless-on.png 
b/packages/nameless/example-nameless-on.png
deleted file mode 100644
index e79cc3a..0000000
Binary files a/packages/nameless/example-nameless-on.png and /dev/null differ
diff --git a/packages/nameless/example-nameless.png 
b/packages/nameless/example-nameless.png
new file mode 100644
index 0000000..38bea2d
Binary files /dev/null and b/packages/nameless/example-nameless.png differ
diff --git a/packages/nameless/nameless.el b/packages/nameless/nameless.el
index eb595a3..6737aa0 100644
--- a/packages/nameless/nameless.el
+++ b/packages/nameless/nameless.el
@@ -4,7 +4,7 @@
 
 ;; Author: Artur Malabarba <address@hidden>
 ;; Keywords: convenience, lisp
-;; Version: 0.3
+;; Version: 0.3.1
 ;; Package-Requires: ((emacs "24.4"))
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -66,9 +66,12 @@ automatically insert `font-lock-'."
   :type '(alist string string))
 
 (defvar nameless-aliases nil
-  "Alist from namespaces to aliases.
-Samse syntax as `nameless-global-aliases', but designed to be
-used as a file-local variable.")
+  "Alist from aliases to namespaces.
+This variable takes the same syntax and has the same effect as
+`nameless-global-aliases'.  Aliases set here take priority over
+those in `nameless-global-aliases'.
+This variable is designed to be used as a file-local or dir-local
+variable.")
 
 (defface nameless-face
   '((t :inherit font-lock-type-face))