[Emacs-diffs] Changes to emacs/lisp/emulation/cua-base.el

[Kim F. Storm]

Index: emacs/lisp/emulation/cua-base.el
diff -c emacs/lisp/emulation/cua-base.el:1.11 
emacs/lisp/emulation/cua-base.el:1.12
*** emacs/lisp/emulation/cua-base.el:1.11       Fri May 31 08:19:57 2002
--- emacs/lisp/emulation/cua-base.el    Fri Jun 21 09:51:05 2002
***************
*** 653,668 ****
  (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)
             (+ arg ?0)))
    (if cua--register nil arg))
- 
  
  ;;; Enhanced undo - restore rectangle selections
  
--- 653,670 ----
  (defun cua--prefix-arg (arg)
    (setq cua--register  
        (and cua-enable-register-prefix
             (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