summaryrefslogtreecommitdiff
path: root/lisp/nxml/rng-valid.el
diff options
context:
space:
mode:
authorKenichi Handa <handa@m17n.org>2011-12-05 16:03:31 +0900
committerKenichi Handa <handa@m17n.org>2011-12-05 16:03:31 +0900
commit2ab04b956544fc24132cee405f93c1a757ebca56 (patch)
treef8ff3a51bac0430ed69b6497568de699f6d3b904 /lisp/nxml/rng-valid.el
parenta79703f53ccd12623371263d93baf0d1be928ec7 (diff)
parent58a70b943c3efcc25e1396c8e67bc440c43a3f0a (diff)
downloademacs-2ab04b956544fc24132cee405f93c1a757ebca56.tar.gz
merge trunk
Diffstat (limited to 'lisp/nxml/rng-valid.el')
-rw-r--r--lisp/nxml/rng-valid.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/nxml/rng-valid.el b/lisp/nxml/rng-valid.el
index 9a29e3d4cca..1f69f5d7bf3 100644
--- a/lisp/nxml/rng-valid.el
+++ b/lisp/nxml/rng-valid.el
@@ -377,8 +377,8 @@ The schema is set like `rng-auto-set-schema'."
(defun rng-kill-timers ()
;; rng-validate-timer and rng-validate-quick-timer have the
;; permanent-local property, so that the timers can be
- ;; cancelled even after changing mode.
- ;; This function takes care of cancelling the timers and
+ ;; canceled even after changing mode.
+ ;; This function takes care of canceling the timers and
;; then killing the local variables.
(when (local-variable-p 'rng-validate-timer)
(when rng-validate-timer