summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorJuanma Barranquero <lekktu@gmail.com>2010-10-14 16:32:27 +0200
committerJuanma Barranquero <lekktu@gmail.com>2010-10-14 16:32:27 +0200
commit220d91b834f7f7252b9953460422151b86b3520c (patch)
tree8f3e16983e83ac0da6beef346cb05cd2591a7f83 /lisp/emacs-lisp
parent31e96eecc09283b5169faf0d5dc1c8efd58539ac (diff)
parent9d4f32e88a1b642070f0adb41df04a0846c31970 (diff)
downloademacs-220d91b834f7f7252b9953460422151b86b3520c.tar.gz
emacs-220d91b834f7f7252b9953460422151b86b3520c.tar.bz2
emacs-220d91b834f7f7252b9953460422151b86b3520c.zip
Merge changes from emacs-23 branch.
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/byte-opt.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el
index 8447d3f05c0..0b4043b1f2a 100644
--- a/lisp/emacs-lisp/byte-opt.el
+++ b/lisp/emacs-lisp/byte-opt.el
@@ -384,7 +384,7 @@
(eq 'lambda (car-safe fn)))
(let ((newform (byte-compile-unfold-lambda form)))
(if (eq newform form)
- ;; Some error occured, avoid infinite recursion
+ ;; Some error occurred, avoid infinite recursion
form
(byte-optimize-form-code-walker newform for-effect))))
((memq fn '(let let*))