Author: sasugaanija
Date: Sat Sep 29 01:26:36 2007
New Revision: 5020
Modified:
trunk/emacs/uim.el
Log:
* Fix bug: C-u C-x f always set fill-column to 4.
- C-u generates listified prefix-argument (i.e. '(4)),
and some commands, such as set-fill-column, distinguish
a listified prefix-argument and a numeric one.
However, uim.el always convert prefix-argument to
a numeric value by using prefix-numeric-value,
and thus C-u C-x f doesn't perform correctly.
Thanks Jae-hyeon for the report.
* emacs/uim.el
- (uim-process-input): Don't convert raw prefix argument to
numeric variable before calling the uim-process-key-vector.
- (uim-process-agent-output): Ditto
Modified: trunk/emacs/uim.el
==============================================================================
--- trunk/emacs/uim.el (original)
+++ trunk/emacs/uim.el Sat Sep 29 01:26:36 2007
@@ -1126,14 +1126,10 @@
(uim-debug (format "issue-vector-raw: %s" issue-vector-raw))
(unwind-protect
- (let (count)
- (if uim-prefix-arg
- (setq count (prefix-numeric-value uim-prefix-arg)))
-
+ (progn
(uim-debug (format "issue command %s %s"
- issue-vector-raw count))
-
- (if (uim-process-key-vector issue-vector-raw count)
+ issue-vector-raw uim-prefix-arg))
+ (if (uim-process-key-vector issue-vector-raw uim-prefix-arg)
(setq wait t)))
(when (not wait)
(uim-debug "* reset parameter after issue")
@@ -1396,10 +1392,8 @@
;; C-o is also processed here ... orz
(let ((inhibit-read-only t))
(unwind-protect
- (let (count)
+ (progn
(uim-debug (format "uim-prefix-arg: %s" uim-prefix-arg))
- (if uim-prefix-arg
- (setq count (prefix-numeric-value uim-prefix-arg)))
;; remove shift if possible
(if (and (uim-check-shift key)
@@ -1413,7 +1407,7 @@
(if (uim-key-binding keytmp)
(setq key keytmp)))))
- (if (uim-process-key-vector key count)
+ (if (uim-process-key-vector key uim-prefix-arg)
(setq uim-wait-next-key t))
(setq keyproc-done t))
(when (not keyproc-done)
