procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Spelling fixes.

Browse source 
* 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.
This commit is contained in:
Paul Eggert 2014-01-05 22:25:30 -08:00
parent c6ab4664a6
commit d5081c1ed8
34 changed files with 60 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/emacs/ChangeLog
View file

@ -1236,7 +1236,7 @@
\\`info- no longer handled specially.
Update for rmail-enable-mime-composing.
Don't mention 'm' for replies.
Don't mention rmail-mail-new-frame and cancelling, since it does
Don't mention rmail-mail-new-frame and canceling, since it does
not work for Message at the moment.
* cal-xtra.texi: Copyedits.

2
doc/emacs/mini.texi
View file

@ -37,7 +37,7 @@ how it will be used. The prompt is highlighted using the
The simplest way to enter a minibuffer argument is to type the text,
then @key{RET} to submit the argument and exit the minibuffer.
Alternatively, you can type @kbd{C-g} to exit the minibuffer by
cancelling the command asking for the argument (@pxref{Quitting}).
canceling the command asking for the argument (@pxref{Quitting}).
@cindex default argument
Sometimes, the prompt shows a @dfn{default argument}, inside

2
doc/misc/semantic.texi
View file

@ -607,7 +607,7 @@ Emacs Lisp. It is an LALR parser suitable for complex languages.
@c LocalWords: backquote bnf bovinate bovinates LALR
@c LocalWords: bovinating bovination bovinator bucketize
@c LocalWords: cb cdr charquote checkcache cindex CLOS
@c LocalWords: concat concocting const constantness ctxt Decl defcustom
@c LocalWords: concat concocting const ctxt Decl defcustom
@c LocalWords: deffn deffnx defun defvar destructor's dfn diff dir
@c LocalWords: doc docstring EDE EIEIO elisp emacsman emph enum
@c LocalWords: eq Exp EXPANDFULL expression fn foo func funcall

2
doc/misc/srecode.texi
View file

@ -342,7 +342,7 @@ area will modify the other linked areas. Pressing TAB will move
between editable fields in the template.
Once the cursor moves out of the are inserted by the template, all the
fields are cancelled.
fields are canceled.
@b{NOTE}: Some conveniences in templates, such as completion, or
character restrictions are lost when using field editing mode.

2
etc/NEWS
View file

@ -856,7 +856,7 @@ are obsolete. Customize the `woman-*' faces instead.
*** The previous version of todo-mode.el is obsolete and renamed otodo-mode.el.
*** xesam.el is obsolete, because the XESAM project has been cancelled.
*** xesam.el is obsolete, because the XESAM project has been canceled.
+++
*** yow.el is obsolete; use fortune.el or cookie1.el instead.

19
lisp/ChangeLog
View file

@ -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>

4
lisp/calc/calc-yank.el
View file

@ -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))

4
lisp/cedet/semantic/complete.el
View file

@ -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

4
lisp/cedet/semantic/edit.el
View file

@ -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))

2
lisp/dired.el
View file

@ -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" "\

2
lisp/emacs-lisp/debug.el
View file

@ -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 ()

2
lisp/emacs-lisp/eieio-opt.el
View file

@ -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)))

6
lisp/epg.el
View file

@ -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))

2
lisp/files.el
View file

@ -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.

2
lisp/filesets.el
View file

@ -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)

2
lisp/gnus/message.el
View file

@ -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:

2
lisp/image-dired.el
View file

@ -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)

2
lisp/international/characters.el
View file

@ -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

2
lisp/international/ucs-normalize.el
View file

@ -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)))

8
lisp/lpr.el
View file

@ -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)

2
lisp/mail/emacsbug.el
View file

@ -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.

2
lisp/mail/sendmail.el
View file

@ -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

2
lisp/net/newsticker.el
View file

@ -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.

2
lisp/obsolete/xesam.el
View file

@ -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"

4
lisp/org/org-clock.el
View file

@ -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.")

2
lisp/ses.el
View file

@ -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

2
lisp/term/ns-win.el
View file

@ -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.

2
lisp/textmodes/table.el
View file

@ -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

2
lisp/whitespace.el
View file

@ -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

2
src/ChangeLog.12
View file

@ -19902,7 +19902,7 @@
now, but we want to make other targets possible.
* lisp.h: Include <inttypes.h>, for INTPTR_MAX, UINTPTR_MAX.
(EMACS_INTPTR, EMACS_UINTPTR): New macros.
In the rest of the code, change types of integers that hold casted
In the rest of the code, change types of integers that hold casts of
pointers to EMACS_INTPTR and EMACS_UINTPTR, systematically
replacing EMACS_INT, long, EMACS_UINT, and unsigned long.
(XTYPE): Don't cast arg to EMACS_UINT; normally is not needed.

2
src/ftfont.c
View file

@ -54,7 +54,7 @@ static Lisp_Object freetype_font_cache;
/* Cache for FT_Face and FcCharSet. */
static Lisp_Object ft_face_cache;
/* The actual structure for FreeType font that can be casted to struct
/* The actual structure for FreeType font that can be cast to struct
font. */
struct ftfont_info

2
src/macfont.m
View file

@ -84,7 +84,7 @@ static CGGlyph mac_ctfont_get_glyph_for_cid (CTFontRef,
struct macfont_metrics;
/* The actual structure for Mac font that can be casted to struct font. */
/* The actual structure for Mac font that can be cast to struct font. */
struct macfont_info
{

2
src/nsterm.m
View file

@ -3506,7 +3506,7 @@ overwriting cursor (usually when cursor on a tab) */
/* GNUStep and OSX <= 10.4 does not have cancelTracking. */
#if defined (NS_IMPL_COCOA) && \
MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
/* Check if menu open should be cancelled or continued as normal. */
/* Check if menu open should be canceled or continued as normal. */
void
ns_check_menu_open (NSMenu *menu)
{

2
src/xftfont.c
View file

@ -42,7 +42,7 @@ Lisp_Object Qxft;
static Lisp_Object QChinting, QCautohint, QChintstyle, QCrgba, QCembolden,
QClcdfilter;
/* The actual structure for Xft font that can be casted to struct
/* The actual structure for Xft font that can be cast to struct
font. */
struct xftfont_info