[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r115885: Spelling fixes.
|
From: |
Paul Eggert |
|
Subject: |
[Emacs-diffs] trunk r115885: Spelling fixes. |
|
Date: |
Mon, 06 Jan 2014 06:26:12 +0000 |
|
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 115885
revision-id: address@hidden
parent: address@hidden
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sun 2014-01-05 22:25:30 -0800
message:
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.
modified:
doc/emacs/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-6227
doc/emacs/mini.texi mini.texi-20091113204419-o5vbwnq5f7feedwu-6266
doc/misc/semantic.texi semantic.texi-20091117210551-bqxn4u9uesl3d17a-2
doc/misc/srecode.texi srecode.texi-20121212171353-60tnfiqymns76dq1-1
etc/NEWS news-20100311060928-aoit31wvzf25yr1z-1
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/calc/calc-yank.el
calcyank.el-20091113204419-o5vbwnq5f7feedwu-2305
lisp/cedet/semantic/complete.el
complete.el-20091113204419-o5vbwnq5f7feedwu-11255
lisp/cedet/semantic/edit.el edit.el-20091113204419-o5vbwnq5f7feedwu-11276
lisp/dired.el dired.el-20091113204419-o5vbwnq5f7feedwu-482
lisp/emacs-lisp/debug.el debug.el-20091113204419-o5vbwnq5f7feedwu-398
lisp/emacs-lisp/eieio-opt.el
eieioopt.el-20091113204419-o5vbwnq5f7feedwu-10971
lisp/epg.el epg.el-20091113204419-o5vbwnq5f7feedwu-8560
lisp/files.el files.el-20091113204419-o5vbwnq5f7feedwu-265
lisp/filesets.el
filesets.el-20091113204419-o5vbwnq5f7feedwu-2414
lisp/gnus/message.el message.el-20091113204419-o5vbwnq5f7feedwu-1145
lisp/image-dired.el
imagedired.el-20091113204419-o5vbwnq5f7feedwu-4485
lisp/international/characters.el
characters.el-20091113204419-o5vbwnq5f7feedwu-1037
lisp/international/ucs-normalize.el
ucsnormalize.el-20091113204419-o5vbwnq5f7feedwu-10918
lisp/lpr.el lpr.el-20091113204419-o5vbwnq5f7feedwu-174
lisp/mail/emacsbug.el emacsbug.el-20091113204419-o5vbwnq5f7feedwu-73
lisp/mail/sendmail.el sendmail.el-20091113204419-o5vbwnq5f7feedwu-290
lisp/net/newsticker.el
newsticker.el-20091113204419-o5vbwnq5f7feedwu-3837
lisp/obsolete/xesam.el xesam.el-20091113204419-o5vbwnq5f7feedwu-8755
lisp/org/org-clock.el
orgclock.el-20091113204419-o5vbwnq5f7feedwu-8644
lisp/ses.el ses.el-20091113204419-o5vbwnq5f7feedwu-2447
lisp/term/ns-win.el nswin.el-20091113204419-o5vbwnq5f7feedwu-8708
lisp/textmodes/table.el table.el-20091113204419-o5vbwnq5f7feedwu-2437
lisp/whitespace.el
whitespace.el-20091113204419-o5vbwnq5f7feedwu-8268
src/ChangeLog.12 changelog.12-20130618111706-x8cck4o4rjixg8cl-2
src/ftfont.c ftfont.c-20091113204419-o5vbwnq5f7feedwu-8542
src/macfont.m macfont.m-20130915173740-04lgloz0557bz98l-2
src/nsterm.m nsterm.m-20091113204419-o5vbwnq5f7feedwu-8747
src/xftfont.c xftfont.c-20091113204419-o5vbwnq5f7feedwu-8548
=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog 2014-01-01 07:43:34 +0000
+++ b/doc/emacs/ChangeLog 2014-01-06 06:25:30 +0000
@@ -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.
=== modified file 'doc/emacs/mini.texi'
--- a/doc/emacs/mini.texi 2014-01-01 07:43:34 +0000
+++ b/doc/emacs/mini.texi 2014-01-06 06:25:30 +0000
@@ -37,7 +37,7 @@
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
=== modified file 'doc/misc/semantic.texi'
--- a/doc/misc/semantic.texi 2014-01-06 05:25:46 +0000
+++ b/doc/misc/semantic.texi 2014-01-06 06:25:30 +0000
@@ -607,7 +607,7 @@
@c LocalWords: backquote bnf bovinate bovinates LALR
@c LocalWords: bovinating bovination bovinator bucketize
@c LocalWords: cb cdr charquote checkcache cindex CLOS
address@hidden LocalWords: concat concocting const constantness ctxt Decl
defcustom
address@hidden 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
=== modified file 'doc/misc/srecode.texi'
--- a/doc/misc/srecode.texi 2014-01-06 05:25:46 +0000
+++ b/doc/misc/srecode.texi 2014-01-06 06:25:30 +0000
@@ -342,7 +342,7 @@
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.
=== modified file 'etc/NEWS'
--- a/etc/NEWS 2014-01-05 23:36:13 +0000
+++ b/etc/NEWS 2014-01-06 06:25:30 +0000
@@ -856,7 +856,7 @@
*** 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.
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-01-06 05:04:57 +0000
+++ b/lisp/ChangeLog 2014-01-06 06:25:30 +0000
@@ -1,3 +1,20 @@
+2014-01-06 Paul Eggert <address@hidden>
+
+ 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 <address@hidden>
* 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 <address@hidden>
* 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 <address@hidden>
=== modified file 'lisp/calc/calc-yank.el'
--- a/lisp/calc/calc-yank.el 2014-01-01 07:43:34 +0000
+++ b/lisp/calc/calc-yank.el 2014-01-06 06:25:30 +0000
@@ -588,7 +588,7 @@
(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 @@
(interactive)
(let ((calc-edit-handler nil))
(calc-edit-finish))
- (message "(Cancelled)"))
+ (message "(Canceled)"))
(defun calc-finish-stack-edit (num)
(let ((buf (current-buffer))
=== modified file 'lisp/cedet/semantic/complete.el'
--- a/lisp/cedet/semantic/complete.el 2014-01-01 07:43:34 +0000
+++ b/lisp/cedet/semantic/complete.el 2014-01-06 06:25:30 +0000
@@ -1968,7 +1968,7 @@
(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 @@
(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
=== modified file 'lisp/cedet/semantic/edit.el'
--- a/lisp/cedet/semantic/edit.el 2014-01-01 07:43:34 +0000
+++ b/lisp/cedet/semantic/edit.el 2014-01-06 06:25:30 +0000
@@ -907,11 +907,11 @@
(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))
=== modified file 'lisp/dired.el'
--- a/lisp/dired.el 2014-01-03 11:21:25 +0000
+++ b/lisp/dired.el 2014-01-06 06:25:30 +0000
@@ -4353,7 +4353,7 @@
;;;***
-;;;### (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" "\
=== modified file 'lisp/emacs-lisp/debug.el'
--- a/lisp/emacs-lisp/debug.el 2014-01-01 07:43:34 +0000
+++ b/lisp/emacs-lisp/debug.el 2014-01-06 06:25:30 +0000
@@ -829,7 +829,7 @@
(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 ()
=== modified file 'lisp/emacs-lisp/eieio-opt.el'
--- a/lisp/emacs-lisp/eieio-opt.el 2014-01-01 07:43:34 +0000
+++ b/lisp/emacs-lisp/eieio-opt.el 2014-01-06 06:25:30 +0000
@@ -749,7 +749,7 @@
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)))
=== modified file 'lisp/epg.el'
--- a/lisp/epg.el 2014-01-01 07:43:34 +0000
+++ b/lisp/epg.el 2014-01-06 06:25:30 +0000
@@ -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 @@
((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 @@
(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))
=== modified file 'lisp/files.el'
--- a/lisp/files.el 2014-01-01 07:43:34 +0000
+++ b/lisp/files.el 2014-01-06 06:25:30 +0000
@@ -5570,7 +5570,7 @@
(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.
=== modified file 'lisp/filesets.el'
--- a/lisp/filesets.el 2014-01-01 07:43:34 +0000
+++ b/lisp/filesets.el 2014-01-06 06:25:30 +0000
@@ -1767,7 +1767,7 @@
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)
=== modified file 'lisp/gnus/message.el'
--- a/lisp/gnus/message.el 2014-01-01 07:43:34 +0000
+++ b/lisp/gnus/message.el 2014-01-06 06:25:30 +0000
@@ -7214,7 +7214,7 @@
(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:
=== modified file 'lisp/image-dired.el'
--- a/lisp/image-dired.el 2014-01-01 07:43:34 +0000
+++ b/lisp/image-dired.el 2014-01-06 06:25:30 +0000
@@ -881,7 +881,7 @@
(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)
=== modified file 'lisp/international/characters.el'
--- a/lisp/international/characters.el 2014-01-01 07:43:34 +0000
+++ b/lisp/international/characters.el 2014-01-06 06:25:30 +0000
@@ -1094,7 +1094,7 @@
;; (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
=== modified file 'lisp/international/ucs-normalize.el'
--- a/lisp/international/ucs-normalize.el 2014-01-01 07:43:34 +0000
+++ b/lisp/international/ucs-normalize.el 2014-01-06 06:25:30 +0000
@@ -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)))
=== modified file 'lisp/lpr.el'
--- a/lisp/lpr.el 2014-01-01 07:43:34 +0000
+++ b/lisp/lpr.el 2014-01-06 06:25:30 +0000
@@ -161,7 +161,7 @@
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 @@
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 @@
(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 @@
(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)
=== modified file 'lisp/mail/emacsbug.el'
--- a/lisp/mail/emacsbug.el 2014-01-01 07:43:34 +0000
+++ b/lisp/mail/emacsbug.el 2014-01-06 06:25:30 +0000
@@ -399,7 +399,7 @@
(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.
=== modified file 'lisp/mail/sendmail.el'
--- a/lisp/mail/sendmail.el 2014-01-01 07:43:34 +0000
+++ b/lisp/mail/sendmail.el 2014-01-06 06:25:30 +0000
@@ -1977,7 +1977,7 @@
(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
=== modified file 'lisp/net/newsticker.el'
--- a/lisp/net/newsticker.el 2014-01-01 07:43:34 +0000
+++ b/lisp/net/newsticker.el 2014-01-06 06:25:30 +0000
@@ -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.
=== modified file 'lisp/obsolete/xesam.el'
--- a/lisp/obsolete/xesam.el 2014-01-01 07:43:34 +0000
+++ b/lisp/obsolete/xesam.el 2014-01-06 06:25:30 +0000
@@ -198,7 +198,7 @@
"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"
=== modified file 'lisp/org/org-clock.el'
--- a/lisp/org/org-clock.el 2014-01-01 07:43:34 +0000
+++ b/lisp/org/org-clock.el 2014-01-06 06:25:30 +0000
@@ -424,7 +424,7 @@
"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 @@
(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.")
=== modified file 'lisp/ses.el'
--- a/lisp/ses.el 2014-01-03 14:18:24 +0000
+++ b/lisp/ses.el 2014-01-06 06:25:30 +0000
@@ -3025,7 +3025,7 @@
(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
=== modified file 'lisp/term/ns-win.el'
--- a/lisp/term/ns-win.el 2014-01-01 07:43:34 +0000
+++ b/lisp/term/ns-win.el 2014-01-06 06:25:30 +0000
@@ -626,7 +626,7 @@
`(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.
=== modified file 'lisp/textmodes/table.el'
--- a/lisp/textmodes/table.el 2014-01-01 07:43:34 +0000
+++ b/lisp/textmodes/table.el 2014-01-06 06:25:30 +0000
@@ -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
=== modified file 'lisp/whitespace.el'
--- a/lisp/whitespace.el 2014-01-01 07:43:34 +0000
+++ b/lisp/whitespace.el 2014-01-06 06:25:30 +0000
@@ -344,7 +344,7 @@
;; Thanks to Andreas Roehler <address@hidden> 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 <address@hidden> for indicating a new
=== modified file 'src/ChangeLog.12'
--- a/src/ChangeLog.12 2014-01-01 07:43:34 +0000
+++ b/src/ChangeLog.12 2014-01-06 06:25:30 +0000
@@ -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.
=== modified file 'src/ftfont.c'
--- a/src/ftfont.c 2014-01-01 07:43:34 +0000
+++ b/src/ftfont.c 2014-01-06 06:25:30 +0000
@@ -54,7 +54,7 @@
/* 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
=== modified file 'src/macfont.m'
--- a/src/macfont.m 2014-01-01 07:43:34 +0000
+++ b/src/macfont.m 2014-01-06 06:25:30 +0000
@@ -84,7 +84,7 @@
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
{
=== modified file 'src/nsterm.m'
--- a/src/nsterm.m 2014-01-05 02:56:08 +0000
+++ b/src/nsterm.m 2014-01-06 06:25:30 +0000
@@ -3506,7 +3506,7 @@
/* 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)
{
=== modified file 'src/xftfont.c'
--- a/src/xftfont.c 2014-01-01 07:43:34 +0000
+++ b/src/xftfont.c 2014-01-06 06:25:30 +0000
@@ -42,7 +42,7 @@
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
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r115885: Spelling fixes.,
Paul Eggert <=