Spelling fixes.

* calc/calc-yank.el (calc-edit-mode, calc-edit-cancel):
* emacs-lisp/debug.el (cancel-debug-on-entry):
* epg.el (epg-error-to-string):
* files.el (recover-file):
* lpr.el (lpr-buffer, print-buffer, lpr-region, print-region):
* mail/emacsbug.el (report-emacs-bug-hook):
* mail/sendmail.el (mail-recover):
* ses.el (ses-yank-resize):
* term/ns-win.el (ns-print-buffer):
Spelling fixes in diagnostics, mostly for "canceled" with one L.
* epg.el (epg-key-capability-alist): Rename from misspelled version.
All uses changed.
* obsolete/xesam.el (xesam-all-fields): Fix misspelled field name.

24 files changed, 50 insertions, 33 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e85ea060a0d..41e267efe1d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,20 @@
+2014-01-06  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Spelling fixes.
+	* calc/calc-yank.el (calc-edit-mode, calc-edit-cancel):
+	* emacs-lisp/debug.el (cancel-debug-on-entry):
+	* epg.el (epg-error-to-string):
+	* files.el (recover-file):
+	* lpr.el (lpr-buffer, print-buffer, lpr-region, print-region):
+	* mail/emacsbug.el (report-emacs-bug-hook):
+	* mail/sendmail.el (mail-recover):
+	* ses.el (ses-yank-resize):
+	* term/ns-win.el (ns-print-buffer):
+	Spelling fixes in diagnostics, mostly for "canceled" with one L.
+	* epg.el (epg-key-capability-alist): Rename from misspelled version.
+	All uses changed.
+	* obsolete/xesam.el (xesam-all-fields): Fix misspelled field name.
+
 2014-01-06  Leo Liu  <sdl.web@gmail.com>
 
 	* dired-x.el (dired-mode-map): Rebind dired-omit-mode to C-x M-o
@@ -7148,7 +7165,7 @@
 2013-07-06  Jan Djärv  <jan.h.d@swipnet.se>
 
 	* files.el (write-file): Do not display confirm dialog for NS,
-	it does its own dialog, which can't be cancelled (Bug#14578).
+	it does its own dialog, which can't be canceled (Bug#14578).
 
 2013-07-06  Eli Zaretskii  <eliz@gnu.org>
 
diff --git a/lisp/calc/calc-yank.el b/lisp/calc/calc-yank.el
index 76ed7efb91c..0f38b318432 100644
--- a/lisp/calc/calc-yank.el
+++ b/lisp/calc/calc-yank.el
@@ -588,7 +588,7 @@ To cancel the edit, simply kill the *Calc Edit* buffer."
     (add-hook 'kill-buffer-hook (lambda ()
                                   (let ((calc-edit-handler nil))
                                     (calc-edit-finish t))
-                                  (message "(Cancelled)")) t t)
+                                  (message "(Canceled)")) t t)
     (insert (propertize
              (concat
               (or title title "Calc Edit Mode. ")
@@ -669,7 +669,7 @@ To cancel the edit, simply kill the *Calc Edit* buffer."
   (interactive)
   (let ((calc-edit-handler nil))
     (calc-edit-finish))
-  (message "(Cancelled)"))
+  (message "(Canceled)"))
 
 (defun calc-finish-stack-edit (num)
   (let ((buf (current-buffer))
diff --git a/lisp/cedet/semantic/complete.el b/lisp/cedet/semantic/complete.el
index 47cf86042c7..a5e9bd1787e 100644
--- a/lisp/cedet/semantic/complete.el
+++ b/lisp/cedet/semantic/complete.el
@@ -1968,7 +1968,7 @@ completion works."
 	 (complst nil))
     (when (and thissym (or (not (string= thissym ""))
 			   nextsym))
-      ;; Do a quick calcuation of completions.
+      ;; Do a quick calculation of completions.
       (semantic-collector-calculate-completions
        collector thissym nil)
       ;; Get the master list
@@ -2048,7 +2048,7 @@ completion works."
 	 (complst nil))
     (when (and thissym (or (not (string= thissym ""))
 			   nextsym))
-      ;; Do a quick calcuation of completions.
+      ;; Do a quick calculation of completions.
       (semantic-collector-calculate-completions
        collector thissym nil)
       ;; Get the master list
diff --git a/lisp/cedet/semantic/edit.el b/lisp/cedet/semantic/edit.el
index 7b148743fcb..f5643f74090 100644
--- a/lisp/cedet/semantic/edit.el
+++ b/lisp/cedet/semantic/edit.el
@@ -907,11 +907,11 @@ pre-positioned to a convenient location."
 
 (defun semantic-edits-splice-insert (newtags parent cachelist)
   "Insert NEWTAGS into PARENT using CACHELIST.
-PARENT could be nil, in which case CACHLIST is the buffer cache
+PARENT could be nil, in which case CACHELIST is the buffer cache
 which must be updated.
 CACHELIST must be searched to find where NEWTAGS are to be inserted.
 The positions of NEWTAGS must be synchronized with those in
-CACHELIST for this to work.  Some routines pre-position CACHLIST at a
+CACHELIST for this to work.  Some routines pre-position CACHELIST at a
 convenient location, so use that."
   (let* ((start (semantic-tag-start (car newtags)))
 	 (newtagendcell (nthcdr (1- (length newtags)) newtags))
diff --git a/lisp/dired.el b/lisp/dired.el
index c768cc0b672..571e0d25be1 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -4353,7 +4353,7 @@ instead.
 
 ;;;***
 
-;;;### (autoloads nil "dired-x" "dired-x.el" "e816f06101aaf6f8a02b0192a58f90ad")
+;;;### (autoloads nil "dired-x" "dired-x.el" "fe5dbf515419da3b9907f32e5d4311fa")
 ;;; Generated autoloads from dired-x.el
 
 (autoload 'dired-jump "dired-x" "\
diff --git a/lisp/emacs-lisp/debug.el b/lisp/emacs-lisp/debug.el
index abaf4591e89..99a50d48b5d 100644
--- a/lisp/emacs-lisp/debug.el
+++ b/lisp/emacs-lisp/debug.el
@@ -829,7 +829,7 @@ To specify a nil argument interactively, exit with an empty minibuffer."
       (progn
         (advice-remove function #'debug--implement-debug-on-entry)
 	function)
-    (message "Cancelling debug-on-entry for all functions")
+    (message "Canceling debug-on-entry for all functions")
     (mapcar #'cancel-debug-on-entry (debug--function-list))))
 
 (defun debugger-list-functions ()
diff --git a/lisp/emacs-lisp/eieio-opt.el b/lisp/emacs-lisp/eieio-opt.el
index 5b56b8447a2..647bbb344b1 100644
--- a/lisp/emacs-lisp/eieio-opt.el
+++ b/lisp/emacs-lisp/eieio-opt.el
@@ -749,7 +749,7 @@ DIR-OR-OBJECT is the object to expand, or nil, and DEPTH is the
 current expansion depth."
   (when (eq (point-min) (point-max))
     ;; This function is only called once, to start the whole deal.
-    ;; Ceate, and expand the default object.
+    ;; Create and expand the default object.
     (eieio-class-button eieio-default-superclass 0)
     (forward-line -1)
     (speedbar-expand-line)))
diff --git a/lisp/epg.el b/lisp/epg.el
index d30678875b3..77181a1a342 100644
--- a/lisp/epg.el
+++ b/lisp/epg.el
@@ -135,7 +135,7 @@
     (?f . full)
     (?u . ultimate)))
 
-(defvar epg-key-capablity-alist
+(defvar epg-key-capability-alist
   '((?e . encrypt)
     (?s . sign)
     (?c . certify)
@@ -1124,7 +1124,7 @@ This function is for internal use only."
    ((eq (car error) 'exit)
     "Exit")
    ((eq (car error) 'quit)
-    "Cancelled")
+    "Canceled")
    ((eq (car error) 'no-data)
     (let ((entry (assq (cdr error) epg-no-data-reason-alist)))
       (if entry
@@ -1922,7 +1922,7 @@ This function is for internal use only."
    (if (aref line 1)
        (cdr (assq (string-to-char (aref line 1)) epg-key-validity-alist)))
    (delq nil
-	 (mapcar (lambda (char) (cdr (assq char epg-key-capablity-alist)))
+	 (mapcar (lambda (char) (cdr (assq char epg-key-capability-alist)))
 		 (aref line 11)))
    (member (aref line 0) '("sec" "ssb"))
    (string-to-number (aref line 3))
diff --git a/lisp/files.el b/lisp/files.el
index 5251c739b3f..cb873b4342f 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -5570,7 +5570,7 @@ non-nil, it is called instead of rereading visited file contents."
 	     (insert-file-contents file-name nil)
 	     (set-buffer-file-coding-system coding-system))
 	   (after-find-file nil nil t))
-	  (t (user-error "Recover-file cancelled")))))
+	  (t (user-error "Recover-file canceled")))))
 
 (defun recover-session ()
   "Recover auto save files from a previous Emacs session.
diff --git a/lisp/filesets.el b/lisp/filesets.el
index f4f47eb811e..790b2830adb 100644
--- a/lisp/filesets.el
+++ b/lisp/filesets.el
@@ -1767,7 +1767,7 @@ Use LOOKUP-NAME for searching additional data if provided."
 				    n name)))
 	      (dolist (this files nil)
 		(filesets-file-open open-function this))
-	    (message "Filesets: cancelled")))
+	    (message "Filesets: canceled")))
       (filesets-error 'error "Filesets: Unknown fileset: " name))))
 
 (defun filesets-close (&optional mode name lookup-name)
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index c7ce2a6ff00..d1a32d52e06 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -7214,7 +7214,7 @@ header line with the old Message-ID."
 	   (let ((buffer-read-only nil))
 	     (erase-buffer)
 	     (insert-file-contents file-name nil)))
-	  (t (error "message-recover cancelled")))))
+	  (t (error "message-recover canceled")))))
 
 ;;; Washing Subject:
 
diff --git a/lisp/image-dired.el b/lisp/image-dired.el
index 1aee7325d57..114deab32a2 100644
--- a/lisp/image-dired.el
+++ b/lisp/image-dired.el
@@ -881,7 +881,7 @@ displayed."
         (progn
           (image-dired-display-thumbs)
           (pop-to-buffer image-dired-thumbnail-buffer))
-      (message "Cancelled."))))
+      (message "Canceled."))))
 
 ;;;###autoload
 (defalias 'image-dired 'image-dired-show-all-from-dir)
diff --git a/lisp/international/characters.el b/lisp/international/characters.el
index 9b02f8946fc..2b656375ca2 100644
--- a/lisp/international/characters.el
+++ b/lisp/international/characters.el
@@ -1094,7 +1094,7 @@ with L, LRE, or LRO Unicode bidi character type.")
 ;;   (LOCALE TABLE (CHARSET (FROM-CODE . TO-CODE) ...) ...)
 ;; LOCALE: locale symbol
 ;; TABLE: char-table used for char-width-table, initially nil.
-;; CAHRSET: character set
+;; CHARSET: character set
 ;; FROM-CODE, TO-CODE: range of code-points in CHARSET
 
 (defvar cjk-char-width-table-list
diff --git a/lisp/international/ucs-normalize.el b/lisp/international/ucs-normalize.el
index 6d13c9004c5..166e5945af6 100644
--- a/lisp/international/ucs-normalize.el
+++ b/lisp/international/ucs-normalize.el
@@ -131,7 +131,7 @@
   This list is taken from
     http://www.unicode.org/Public/UNIDATA/5.2/CompositionExclusions.txt")
 
-  ;; Unicode ranges that decompositions & combinings are defined.
+  ;; Unicode ranges that decompositions & combining characters are defined.
   (defvar check-range nil)
     (setq check-range '((#x00a0 . #x3400) (#xA600 . #xAC00) (#xF900 . #x110ff) (#x1d000 . #x1dfff) (#x1f100 . #x1f2ff) (#x2f800 . #x2faff)))
 
diff --git a/lisp/lpr.el b/lisp/lpr.el
index f9214d19280..86164aebdff 100644
--- a/lisp/lpr.el
+++ b/lisp/lpr.el
@@ -161,7 +161,7 @@ See the variables `lpr-switches' and `lpr-command'
 for customization of the printer command."
   (interactive
    (unless (y-or-n-p "Send current buffer to default printer? ")
-     (error "Cancelled")))
+     (error "Canceled")))
   (print-region-1 (point-min) (point-max) lpr-switches nil))
 
 ;;;###autoload
@@ -180,7 +180,7 @@ See the variables `lpr-switches' and `lpr-command'
 for further customization of the printer command."
   (interactive
    (unless (y-or-n-p "Send current buffer to default printer? ")
-     (error "Cancelled")))
+     (error "Canceled")))
   (print-region-1 (point-min) (point-max) lpr-switches t))
 
 ;;;###autoload
@@ -191,7 +191,7 @@ for customization of the printer command."
   (interactive
    (if (y-or-n-p "Send selected text to default printer? ")
        (list (region-beginning) (region-end))
-     (error "Cancelled")))
+     (error "Canceled")))
   (print-region-1 start end lpr-switches nil))
 
 ;;;###autoload
@@ -211,7 +211,7 @@ for further customization of the printer command."
   (interactive
    (if (y-or-n-p "Send selected text to default printer? ")
        (list (region-beginning) (region-end))
-     (error "Cancelled")))
+     (error "Canceled")))
   (print-region-1 start end lpr-switches t))
 
 (defun print-region-1 (start end switches page-headers)
diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el
index a0b968c200c..125e86dba9d 100644
--- a/lisp/mail/emacsbug.el
+++ b/lisp/mail/emacsbug.el
@@ -399,7 +399,7 @@ and send the mail again%s."
                             (format " using \\[%s]"
                                     report-emacs-bug-send-command)
                           "")))))
-      (error "M-x report-emacs-bug was cancelled, please read *Bug Help* buffer"))
+      (error "M-x report-emacs-bug was canceled, please read *Bug Help* buffer"))
     ;; Query the user for the SMTP method, so that we can skip
     ;; questions about From header validity if the user is going to
     ;; use mailclient, anyway.
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 0d6cc1f0046..a0251a109fb 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -1977,7 +1977,7 @@ you can move to one of them and type C-c C-c to recover that one."
 	     (if (not (yes-or-no-p
 		       (format "Recover mail draft from auto save file %s? "
 			       file-name)))
-		 (error "mail-recover cancelled")
+		 (error "mail-recover canceled")
 	       (let ((buffer-read-only nil)
 		     (buffer-coding buffer-file-coding-system)
 		     ;; Auto-save files are written in internal
diff --git a/lisp/net/newsticker.el b/lisp/net/newsticker.el
index d9f2b4767b6..c77058a1e19 100644
--- a/lisp/net/newsticker.el
+++ b/lisp/net/newsticker.el
@@ -378,7 +378,7 @@
 ;;      * Remove stupid newlines in titles (headlines) -- Thanks to
 ;;        Jeff Rancier.
 
-;; 0.94 * Added clickerability and description for channel headings.
+;; 0.94 * Added clickability and description for channel headings.
 ;;      * Made it work for (at least some) rss 0.9<something> feeds.
 
 ;; 0.93 * Added some more sites.
diff --git a/lisp/obsolete/xesam.el b/lisp/obsolete/xesam.el
index 1fda79983ac..36da1c10ba2 100644
--- a/lisp/obsolete/xesam.el
+++ b/lisp/obsolete/xesam.el
@@ -198,7 +198,7 @@ be different at least in one face property not set in that face."
     "xesam:colorCount" "xesam:colorSpace" "xesam:columnCount" "xesam:comment"
     "xesam:commentCharacterCount" "xesam:conflicts" "xesam:contactMedium"
     "xesam:contactName" "xesam:contactNick" "xesam:contactPhoto"
-    "xesam:contactURL" "xesam:contains" "xesam:contenKeyword"
+    "xesam:contactURL" "xesam:contains" "xesam:contentKeyword"
     "xesam:contentComment" "xesam:contentCreated" "xesam:contentModified"
     "xesam:contentType" "xesam:contributor" "xesam:copyright" "xesam:creator"
     "xesam:definesClass" "xesam:definesFunction" "xesam:definesGlobalVariable"
diff --git a/lisp/org/org-clock.el b/lisp/org/org-clock.el
index 508be8c4e8f..fa50f9dda95 100644
--- a/lisp/org/org-clock.el
+++ b/lisp/org/org-clock.el
@@ -424,7 +424,7 @@ to add an effort property.")
   "Hook run when stopping the current clock.")
 
 (defvar org-clock-cancel-hook nil
-  "Hook run when cancelling the current clock.")
+  "Hook run when canceling the current clock.")
 (defvar org-clock-goto-hook nil
   "Hook run when selecting the currently clocked-in entry.")
 (defvar org-clock-has-been-used nil
@@ -441,7 +441,7 @@ to add an effort property.")
 (defvar org-clock-start-time "")
 
 (defvar org-clock-leftover-time nil
-  "If non-nil, user cancelled a clock; this is when leftover time started.")
+  "If non-nil, user canceled a clock; this is when leftover time started.")
 
 (defvar org-clock-effort ""
   "Effort estimate of the currently clocking task.")
diff --git a/lisp/ses.el b/lisp/ses.el
index feaa7bd91d4..5109cac2a87 100644
--- a/lisp/ses.el
+++ b/lisp/ses.el
@@ -3025,7 +3025,7 @@ spot, or error signal if user requests cancel."
 			    (if rowbool (format "%d rows" needrows) "")
 			    (if (and rowbool colbool) " and " "")
 			    (if colbool (format "%d columns" needcols) "")))
-	  (error "Cancelled"))
+	  (error "Canceled"))
       (when rowbool
 	(let (ses--curcell)
 	  (save-excursion
diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el
index 432163a7d9c..70c91de558f 100644
--- a/lisp/term/ns-win.el
+++ b/lisp/term/ns-win.el
@@ -626,7 +626,7 @@ the last file dropped is selected."
                                   `(mouse-1 POSITION 1))))
         (if (y-or-n-p (format "Print buffer %s? " (buffer-name)))
             (print-buffer)
-	  (error "Cancelled")))
+	  (error "Canceled")))
     (print-buffer)))
 
 ;;;; Font support.
diff --git a/lisp/textmodes/table.el b/lisp/textmodes/table.el
index 7de53e12847..60aabc32c9f 100644
--- a/lisp/textmodes/table.el
+++ b/lisp/textmodes/table.el
@@ -559,7 +559,7 @@
 ;; Todo: (in the order of priority, some are just possibility)
 ;; -----
 ;;
-;; Fix compatibilities with other input method than quail
+;; Fix incompatibilities with input methods other than quail
 ;; Resolve conflict with flyspell
 ;; Use mouse for resizing cells
 ;; A mechanism to link cells internally
diff --git a/lisp/whitespace.el b/lisp/whitespace.el
index 1d0147284c4..7630ffbdb9c 100644
--- a/lisp/whitespace.el
+++ b/lisp/whitespace.el
@@ -344,7 +344,7 @@
 ;; Thanks to Andreas Roehler <andreas.roehler@easy-emacs.de> for
 ;; indicating defface byte-compilation warnings.
 ;;
-;; Thanks to TimOCallaghan (EmacsWiki) for the idea about highlight
+;; Thanks to Tim O'Callaghan (EmacsWiki) for the idea about highlight
 ;; "long" lines.  See EightyColumnRule (EmacsWiki).
 ;;
 ;; Thanks to Yanghui Bian <yanghuibian@gmail.com> for indicating a new