procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove references to universal-argument-num-events.

Browse source 
* lisp/autoarg.el (autoarg-kp-digit-argument):
* lisp/electric.el (Electric-command-loop):
* lisp/kmacro.el (kmacro-step-edit-insert):
  Do not set universal-argument-num-events.
This commit is contained in:
Juanma Barranquero 2013-09-23 04:58:02 +02:00
parent a84683fdd5
commit 57b16162ce
4 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lisp/ChangeLog
View file

@ -1,3 +1,10 @@
2013-09-23 Juanma Barranquero <lekktu@gmail.com>
* autoarg.el (autoarg-kp-digit-argument):
* electric.el (Electric-command-loop):
* kmacro.el (kmacro-step-edit-insert):
Do not set universal-argument-num-events.
2013-09-22 Leo Liu <sdl.web@gmail.com>
* files.el (interpreter-mode-alist): Add octave.

1
lisp/autoarg.el
View file

@ -75,7 +75,6 @@
(setq prefix-arg (if (zerop digit) '- (- digit))))
(t
(setq prefix-arg digit))))
(setq universal-argument-num-events (length (this-command-keys)))
(setq overriding-terminal-local-map universal-argument-map))
(defvar autoarg-kp-mode-map

2
lisp/electric.el
View file

@ -78,8 +78,6 @@
(setq last-command-event (aref cmd (1- (length cmd)))
this-command (key-binding cmd t)
cmd this-command)
;; This makes universal-argument-other-key work.
(setq universal-argument-num-events 0)
(if (or (prog1 quit-flag (setq quit-flag nil))
(eq last-input-event ?\C-g))
(progn (setq unread-command-events nil

3
lisp/kmacro.el
View file

@ -1194,12 +1194,10 @@ following additional answers: `insert', `insert-1', `replace', `replace-1',
(setq cmd 'ignore)
nil)
((memq cmd kmacro-step-edit-prefix-commands)
(setq universal-argument-num-events 0)
(reset-this-command-lengths)
nil)
((eq cmd 'universal-argument-other-key)
(setq kmacro-step-edit-action t)
(setq universal-argument-num-events 0)
(reset-this-command-lengths)
(if (numberp kmacro-step-edit-inserting)
(setq kmacro-step-edit-inserting nil))
@ -1214,7 +1212,6 @@ following additional answers: `insert', `insert-1', `replace', `replace-1',
(setq kmacro-step-edit-prefix-index nil)
(reset-this-command-lengths)
(setq overriding-terminal-local-map nil)
(setq universal-argument-num-events nil)
(setq next-index kmacro-step-edit-key-index)
t)
(t nil))