Properly detect prefix arguments in Emacs >= 25.1

paldepind · May 1, 2016 · 3217f3d · 3217f3d
1 parent 5f71fdb
commit 3217f3d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,6 +1,7 @@
 # Changes
 
 - master
+  - Properly detect prefix arguments in Emacs >= 25.1
   - Fix breakage of mark popping with C-u C-SPC
   - Fix error when object mode entered trough composable-mark-mode for
     the first time.

diff --git a/composable.el b/composable.el
@@ -188,7 +188,8 @@ For each function named foo a function name composable-foo is created."
   (cond
    (composable--skip-first
     (setq composable--skip-first nil))
-   ((not (member this-command composable--arguments))
+   ((and (not (member this-command composable--arguments)) ;; detect prefix < 25.1
+         (not (eq last-command this-command))) ;; in 25.1 prefix args don't change `this-command'
     (when composable--prefix-arg (composable--handle-prefix this-command composable--fn-pairs))
     (when composable-repeat (composable--activate-repeat this-command (point-marker)))
     (composable--call-excursion composable--command composable--start-point)