aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2014-01-05 22:25:30 -0800
committerPaul Eggert2014-01-05 22:25:30 -0800
commitd5081c1ed8e0dd509007b7a617d2640686e91f75 (patch)
tree5937286793780defc1108b003ffb3157ad788d95 /src
parentc6ab4664a6078ad91af0a61583734d99ba5569f7 (diff)
downloademacs-d5081c1ed8e0dd509007b7a617d2640686e91f75.tar.gz
emacs-d5081c1ed8e0dd509007b7a617d2640686e91f75.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog.122
-rw-r--r--src/ftfont.c2
-rw-r--r--src/macfont.m2
-rw-r--r--src/nsterm.m2
-rw-r--r--src/xftfont.c2
5 files changed, 5 insertions, 5 deletions
diff --git a/src/ChangeLog.12 b/src/ChangeLog.12
index 63c7c9df68d..07aedadccae 100644
--- a/src/ChangeLog.12
+++ b/src/ChangeLog.12
@@ -19902,7 +19902,7 @@
19902 now, but we want to make other targets possible. 19902 now, but we want to make other targets possible.
19903 * lisp.h: Include <inttypes.h>, for INTPTR_MAX, UINTPTR_MAX. 19903 * lisp.h: Include <inttypes.h>, for INTPTR_MAX, UINTPTR_MAX.
19904 (EMACS_INTPTR, EMACS_UINTPTR): New macros. 19904 (EMACS_INTPTR, EMACS_UINTPTR): New macros.
19905 In the rest of the code, change types of integers that hold casted 19905 In the rest of the code, change types of integers that hold casts of
19906 pointers to EMACS_INTPTR and EMACS_UINTPTR, systematically 19906 pointers to EMACS_INTPTR and EMACS_UINTPTR, systematically
19907 replacing EMACS_INT, long, EMACS_UINT, and unsigned long. 19907 replacing EMACS_INT, long, EMACS_UINT, and unsigned long.
19908 (XTYPE): Don't cast arg to EMACS_UINT; normally is not needed. 19908 (XTYPE): Don't cast arg to EMACS_UINT; normally is not needed.
diff --git a/src/ftfont.c b/src/ftfont.c
index 1df61b20a5f..384989732e1 100644
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -54,7 +54,7 @@ static Lisp_Object freetype_font_cache;
54/* Cache for FT_Face and FcCharSet. */ 54/* Cache for FT_Face and FcCharSet. */
55static Lisp_Object ft_face_cache; 55static Lisp_Object ft_face_cache;
56 56
57/* The actual structure for FreeType font that can be casted to struct 57/* The actual structure for FreeType font that can be cast to struct
58 font. */ 58 font. */
59 59
60struct ftfont_info 60struct ftfont_info
diff --git a/src/macfont.m b/src/macfont.m
index 80088b31256..feeee1fbebf 100644
--- a/src/macfont.m
+++ b/src/macfont.m
@@ -84,7 +84,7 @@ static Lisp_Object QCminspace;
84 84
85struct macfont_metrics; 85struct macfont_metrics;
86 86
87/* The actual structure for Mac font that can be casted to struct font. */ 87/* The actual structure for Mac font that can be cast to struct font. */
88 88
89struct macfont_info 89struct macfont_info
90{ 90{
diff --git a/src/nsterm.m b/src/nsterm.m
index eefaea8888f..686db4c68ce 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -3506,7 +3506,7 @@ check_native_fs ()
3506/* GNUStep and OSX <= 10.4 does not have cancelTracking. */ 3506/* GNUStep and OSX <= 10.4 does not have cancelTracking. */
3507#if defined (NS_IMPL_COCOA) && \ 3507#if defined (NS_IMPL_COCOA) && \
3508 MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 3508 MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
3509/* Check if menu open should be cancelled or continued as normal. */ 3509/* Check if menu open should be canceled or continued as normal. */
3510void 3510void
3511ns_check_menu_open (NSMenu *menu) 3511ns_check_menu_open (NSMenu *menu)
3512{ 3512{
diff --git a/src/xftfont.c b/src/xftfont.c
index 66a731562fb..32816b97f23 100644
--- a/src/xftfont.c
+++ b/src/xftfont.c
@@ -42,7 +42,7 @@ Lisp_Object Qxft;
42static Lisp_Object QChinting, QCautohint, QChintstyle, QCrgba, QCembolden, 42static Lisp_Object QChinting, QCautohint, QChintstyle, QCrgba, QCembolden,
43 QClcdfilter; 43 QClcdfilter;
44 44
45/* The actual structure for Xft font that can be casted to struct 45/* The actual structure for Xft font that can be cast to struct
46 font. */ 46 font. */
47 47
48struct xftfont_info 48struct xftfont_info