[elpa] master 98e1de1 3/3: Merge commit 'ab1a5c589378334eafca105af1a17f73b9065423'

[Artur Malabarba]

branch: master
commit 98e1de191a09ec16f13e59f6a1f0d6b1a51b9aa0
Merge: d0a3350 ab1a5c5
Author: Artur Malabarba <address@hidden>
Commit: Artur Malabarba <address@hidden>

    Merge commit 'ab1a5c589378334eafca105af1a17f73b9065423'
---
 packages/nameless/nameless.el |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/nameless/nameless.el b/packages/nameless/nameless.el
index 3f21756..eede973 100644
--- a/packages/nameless/nameless.el
+++ b/packages/nameless/nameless.el
@@ -5,7 +5,7 @@
 ;; Author: Artur Malabarba <address@hidden>
 ;; URL: https://github.com/Malabarba/nameless
 ;; Keywords: convenience, lisp
-;; Version: 1.0.1
+;; Version: 1.0.2
 ;; Package-Requires: ((emacs "24.4"))
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -229,7 +229,9 @@ configured, or if `nameless-current-name' is nil."
         (user-error "No name for current buffer, see 
`nameless-current-name'")))))
 
 (defun nameless-insert-name-or-self-insert (&optional self-insert)
-  "Insert the name of current package, with a hyphen."
+  "Insert the name of current package, with a hyphen.
+If point is in an argument list, or if we're typing an escaped
+character, insert the current character literally instead."
   (interactive "P")
   (let ((l (point)))
     (call-interactively #'self-insert-command)