Merge changes from emacs-23 branch.

2010-10-14 16:32:27 +02:00 · 2010-10-14 16:32:27 +02:00 · 220d91b834
commit 220d91b834
parent 31e96eecc0 9d4f32e88a
50 changed files with 310 additions and 246 deletions
--- 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*))