summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/bytecomp.el
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2011-11-19 19:07:02 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2011-11-19 19:07:02 -0800
commit615a3b8d0d2c88cd664f1e0beb5a32b5b8e08f90 (patch)
treee0458a9eac443c36a3a4bfa117fde01bbd6e4140 /lisp/emacs-lisp/bytecomp.el
parentc3ca24d48c10fb771ee02eb58f7d49bd82d6306e (diff)
parente1dbe924b53c541fdf238a5a722b7177d5c8760b (diff)
downloademacs-615a3b8d0d2c88cd664f1e0beb5a32b5b8e08f90.tar.gz
Merge from trunk.
Diffstat (limited to 'lisp/emacs-lisp/bytecomp.el')
-rw-r--r--lisp/emacs-lisp/bytecomp.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 84aaf8718ed..2e05e93d569 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -743,7 +743,7 @@ BYTES and PC are updated after evaluating all the arguments."
(defmacro byte-compile-push-bytecode-const2 (opcode const2 bytes pc)
"Push OPCODE and the two-byte constant CONST2 onto BYTES, and add 3 to PC.
-CONST2 may be evaulated multiple times."
+CONST2 may be evaluated multiple times."
`(byte-compile-push-bytecodes ,opcode (logand ,const2 255) (lsh ,const2 -8)
,bytes ,pc))
@@ -2195,7 +2195,7 @@ list that represents a doc string reference.
(byte-compile-keep-pending form)))))
;; Functions and variables with doc strings must be output separately,
-;; so make-docfile can recognise them. Most other things can be output
+;; so make-docfile can recognize them. Most other things can be output
;; as byte-code.
(put 'autoload 'byte-hunk-handler 'byte-compile-file-form-autoload)