Mercurial > emacs

changeset 45952:ec1df96b1c23

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(cua--prefix-arg): Make register prefixes work again. Corrected error in check for C-u initiated prefix.
author Kim F. Storm <storm@cua.dk>
date Fri, 21 Jun 2002 13:51:05 +0000
parents 22df09591197
children 66857c2230b6
files lisp/emulation/cua-base.el
diffstat 1 files changed, 9 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/emulation/cua-base.el	Fri Jun 21 13:50:33 2002 +0000
+++ b/lisp/emulation/cua-base.el	Fri Jun 21 13:51:05 2002 +0000
@@ -653,17 +653,19 @@
 (defun cua--prefix-arg (arg)
   (setq cua--register  
 	(and cua-enable-register-prefix
-	     (integerp (this-command-keys))
-	     (cond ((eq cua-enable-register-prefix 'not-ctrl-u)
-		    (not (= (aref (this-command-keys) 0) ?\C-u)))
-		   ((eq cua-enable-register-prefix 'ctrl-u-only)
-		    (= (aref (this-command-keys) 0) ?\C-u))
-		   (t t))
 	     (integerp arg) (>= arg 0) (< arg 10)
+	     (let* ((prefix (aref (this-command-keys) 0))
+		    (ctrl-u-prefix (and (integerp prefix)
+					(= prefix ?\C-u)))))
+	     (cond 
+	      ((eq cua-enable-register-prefix 'not-ctrl-u)
+	       (not ctrl-u-prefix))
+	      ((eq cua-enable-register-prefix 'ctrl-u-only)
+	       ctrl-u-prefix)
+	      (t t))
 	     (+ arg ?0)))
   (if cua--register nil arg))
 
-
 ;;; Enhanced undo - restore rectangle selections
 
 (defun cua-undo (&optional arg)