Merge commit 'ea3958f45cb468be0f11e95c24d09e10a389fee0'

diff --combined packages/nameless/README.org
index 75f8835d1e1f1c14e79dde9e8187837f14887250,367ffedaeac055a30d835bf965a52d86287e27dc..367ffedaeac055a30d835bf965a52d86287e27dc
--- 1/packages/nameless/README.org
--- 2/README.org
+++ b/packages/nameless/README.org
@@@ -22,13 -22,13 +22,13 @@@ You can configure a string to use inste
  You can even just hide the prefix completely by setting this variable
  to an empty string.
  
- While the mode is active, the <kbd>C-c C--</kbd> key inserts the
+ While the mode is active, the =C-c C--= key inserts the
  package namespace if appropriate.
  
  * Configuration
  
  ** Quickly typing the namespace
- ~nameless-mode~ binds the <kbd>C-c C--</kbd> key to
+ ~nameless-mode~ binds the =C-c C--= key to
  ~nameless-insert-name~, which immediately inserts the current name for
  you, or even expands aliases to the names they point to.
  
@@@ -39,7 -39,7 +39,7 @@@ fl C-c C-- → font-lock
  #+END_SRC
  
  There’s also a command called ~nameless-insert-name-or-self-insert~.
- You can bind this to the <kbd>_</kbd> key and make it even faster to
+ You can bind this to the =_= key and make it even faster to
  insert the name.
  ** Configuring the namespace name
  Nameless guesses the package name with the ~lm-get-package-name~
@@@ -75,7 -75,7 +75,7 @@@ as a file-local variable
  ;; nameless-aliases: (("c" . "cider"))
  ;; End:
  #+END_SRC
- /Note that there’s no ~quote~ before ~((c~!/\\
+ Note that there’s no ~quote~ before ~((c~!\\
  You can also configure it for a whole project, by setting it as a dir-local variable.
  
  ** Indentation and paragraph filling

diff --combined packages/nameless/nameless.el
index a0d517738aab928e9b5363c639b09ea4eea9fd4d,f7b47efd840d4c3e1cf4dc68bc4c35bdac471504..f7b47efd840d4c3e1cf4dc68bc4c35bdac471504
--- 1/packages/nameless/nameless.el
--- 2/nameless.el
+++ b/packages/nameless/nameless.el
@@@ -4,7 -4,7 +4,7 @@@
  
  ;; Author: Artur Malabarba <emacs@endlessparentheses.com>
  ;; Keywords: convenience, lisp
- ;; Version: 0.4
+ ;; Version: 0.4.1
  ;; Package-Requires: ((emacs "24.4"))
  
  ;; This program is free software; you can redistribute it and/or modify
@@@ -227,7 -227,7 +227,7 @@@ Return S.
                (ignore-errors (string-match "\\.el\\'" (lm-get-package-name))))
            (progn
              (unless nameless-current-name
-               (setq nameless-current-name (replace-regexp-in-string "\\.[^.]*\\'" "" (lm-get-package-name))))
+               (setq nameless-current-name (replace-regexp-in-string "\\(-mode\\)?\\.[^.]*\\'" "" (lm-get-package-name))))
              (add-function :filter-return (local 'filter-buffer-substring-function)
                            #'nameless--filter-string)
              (apply #'nameless--add-keywords