X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fbytecomp.el;h=a7bbe8d15254aa5ae650f068ba76bf08988a891a;hb=a3c8db1e07b33da64b3af89f0c8923619e8e1ee4;hp=cf62f7caeffe26ead94d34e12f46ccf6b09f9039;hpb=d0e07e9cc4a67494b89f54a73d23443e8789676b;p=chise%2Fxemacs-chise.git.1

diff --git a/lisp/bytecomp.el b/lisp/bytecomp.el
index cf62f7c..a7bbe8d 100644
--- a/lisp/bytecomp.el
+++ b/lisp/bytecomp.el
@@ -1284,7 +1284,7 @@ otherwise pop it")
     (setq unreferenced (nreverse unreferenced))
     (while unreferenced
       (byte-compile-warn
-       (format "variable %s bound but not referenced" (car unreferenced)))
+       "variable %s bound but not referenced" (car unreferenced))
       (setq unreferenced (cdr unreferenced)))))
 
 
@@ -2946,7 +2946,7 @@ If FORM is a lambda or a macro, byte-compile it as a function."
 (byte-defop-compiler char-after		0-1+1)
 (byte-defop-compiler set-buffer		1)
 ;;(byte-defop-compiler set-mark		1) ;; obsolete
-(byte-defop-compiler forward-word	1+1)
+(byte-defop-compiler forward-word	0-1+1)
 (byte-defop-compiler char-syntax	1+1)
 (byte-defop-compiler nreverse		1)
 (byte-defop-compiler car-safe		1)
@@ -3921,7 +3921,7 @@ If FORM is a lambda or a macro, byte-compile it as a function."
 	      ;; `defconst' sets `var' unconditionally.
 	      `(setq ,var ,value)
 	    ;; `defvar' sets `var' only when unbound.
-	    `(if (not (boundp ',var)) (setq ,var ,value))))
+	    `(if (not (default-boundp ',var)) (set-default ',var ,value))))
       `',var))))
 
 (defun byte-compile-autoload (form)