summaryrefslogtreecommitdiff
path: root/lisp/cedet/srecode/fields.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/cedet/srecode/fields.el
parentc3ca24d48c10fb771ee02eb58f7d49bd82d6306e (diff)
parente1dbe924b53c541fdf238a5a722b7177d5c8760b (diff)
downloademacs-615a3b8d0d2c88cd664f1e0beb5a32b5b8e08f90.tar.gz
emacs-615a3b8d0d2c88cd664f1e0beb5a32b5b8e08f90.tar.bz2
emacs-615a3b8d0d2c88cd664f1e0beb5a32b5b8e08f90.zip
Merge from trunk.
Diffstat (limited to 'lisp/cedet/srecode/fields.el')
-rw-r--r--lisp/cedet/srecode/fields.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/cedet/srecode/fields.el b/lisp/cedet/srecode/fields.el
index 088781cfb53..f13fb17ca8f 100644
--- a/lisp/cedet/srecode/fields.el
+++ b/lisp/cedet/srecode/fields.el
@@ -101,7 +101,7 @@ Has virtual :start and :end initializers.")
))
;; Create a temporary overlay now. We have to use an overlay and
- ;; not a marker becaues of the in-front insertion rules. The rules
+ ;; not a marker because of the in-front insertion rules. The rules
;; are backward from what is wanted while typing.
(setq olay (make-overlay start end (current-buffer) t nil))
(overlay-put olay 'srecode-init-only t)
@@ -338,7 +338,7 @@ PRE-LEN is used in the after mode for the length of the changed text."
(inhibit-modification-hooks t)
)
;; Sometimes a field is deleted, but we might still get a stray
- ;; event. Lets just ignore those events.
+ ;; event. Let's just ignore those events.
(when (slot-boundp field 'overlay)
;; First, fixup the two overlays, in case they got confused.
(let ((main (oref field overlay))