aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/conf_post.h2
-rw-r--r--src/fileio.c2
-rw-r--r--src/image.c2
-rw-r--r--src/itree.c2
-rw-r--r--src/tparam.c2
-rw-r--r--src/window.c2
-rw-r--r--src/xfont.c2
-rw-r--r--src/xterm.c2
8 files changed, 8 insertions, 8 deletions
diff --git a/src/conf_post.h b/src/conf_post.h
index 0d5f90a6910..1a8c35720f2 100644
--- a/src/conf_post.h
+++ b/src/conf_post.h
@@ -96,7 +96,7 @@ typedef bool bool_bf;
96#ifdef emacs 96#ifdef emacs
97/* We include stdlib.h here, because Gnulib's stdlib.h might redirect 97/* We include stdlib.h here, because Gnulib's stdlib.h might redirect
98 'free' to its replacement, and we want to avoid that in unexec 98 'free' to its replacement, and we want to avoid that in unexec
99 builds. Inclduing it here will render its inclusion after config.h 99 builds. Including it here will render its inclusion after config.h
100 a no-op. */ 100 a no-op. */
101# if (defined DARWIN_OS && defined HAVE_UNEXEC) || defined HYBRID_MALLOC 101# if (defined DARWIN_OS && defined HAVE_UNEXEC) || defined HYBRID_MALLOC
102# include <stdlib.h> 102# include <stdlib.h>
diff --git a/src/fileio.c b/src/fileio.c
index 4d5365bff9a..4d3aea3554e 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -758,7 +758,7 @@ DEFUN ("file-name-concat", Ffile_name_concat, Sfile_name_concat, 1, MANY, 0,
758Elements in COMPONENTS must be a string or nil. 758Elements in COMPONENTS must be a string or nil.
759DIRECTORY or the non-final elements in COMPONENTS may or may not end 759DIRECTORY or the non-final elements in COMPONENTS may or may not end
760with a slash -- if they don't end with a slash, a slash will be 760with a slash -- if they don't end with a slash, a slash will be
761inserted before contatenating. 761inserted before concatenating.
762usage: (record DIRECTORY &rest COMPONENTS) */) 762usage: (record DIRECTORY &rest COMPONENTS) */)
763 (ptrdiff_t nargs, Lisp_Object *args) 763 (ptrdiff_t nargs, Lisp_Object *args)
764{ 764{
diff --git a/src/image.c b/src/image.c
index c717ac88dca..e557f97377d 100644
--- a/src/image.c
+++ b/src/image.c
@@ -11424,7 +11424,7 @@ svg_load_image (struct frame *f, struct image *img, char *contents,
11424 } 11424 }
11425 11425
11426#if HAVE_NTGUI 11426#if HAVE_NTGUI
11427 /* Windows stores the image colours in BGR format, and SVG expects 11427 /* Windows stores the image colors in BGR format, and SVG expects
11428 them in RGB. */ 11428 them in RGB. */
11429 foreground = (foreground & 0x0000FF) << 16 11429 foreground = (foreground & 0x0000FF) << 16
11430 | (foreground & 0xFF0000) >> 16 11430 | (foreground & 0xFF0000) >> 16
diff --git a/src/itree.c b/src/itree.c
index b8db08bc74c..6e80c330c94 100644
--- a/src/itree.c
+++ b/src/itree.c
@@ -74,7 +74,7 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */
74 74
75 Consider the case where next-overlay-change is called at POS, all 75 Consider the case where next-overlay-change is called at POS, all
76 interval BEG positions are less than pos POS and all interval END 76 interval BEG positions are less than pos POS and all interval END
77 posistions are after. These END positions have no order, and so 77 positions are after. These END positions have no order, and so
78 *every* interval must be examined. This is at least O(N). The 78 *every* interval must be examined. This is at least O(N). The
79 previous-overlay-change case is similar. The root issue is that 79 previous-overlay-change case is similar. The root issue is that
80 the iterative "narrowing" approach is not guaranteed to reduce the 80 the iterative "narrowing" approach is not guaranteed to reduce the
diff --git a/src/tparam.c b/src/tparam.c
index 1a5eab37452..d1db99e7417 100644
--- a/src/tparam.c
+++ b/src/tparam.c
@@ -184,7 +184,7 @@ tparam1 (const char *string, char *outstring, int len,
184 argp++; 184 argp++;
185 break; 185 break;
186 186
187 case 'b': /* %b means back up one arg (and re-use it). */ 187 case 'b': /* %b means back up one arg (and reuse it). */
188 argp--; 188 argp--;
189 break; 189 break;
190 190
diff --git a/src/window.c b/src/window.c
index 1dc977626b3..a5d88e2ad87 100644
--- a/src/window.c
+++ b/src/window.c
@@ -526,7 +526,7 @@ select_window (Lisp_Object window, Lisp_Object norecord,
526 /* Do not select a tooltip window (Bug#47207). */ 526 /* Do not select a tooltip window (Bug#47207). */
527 error ("Cannot select a tooltip window"); 527 error ("Cannot select a tooltip window");
528 528
529 /* We deinitely want to select WINDOW, not the mini-window. */ 529 /* We definitely want to select WINDOW, not the mini-window. */
530 f->select_mini_window_flag = false; 530 f->select_mini_window_flag = false;
531 531
532 /* Make the selected window's buffer current. */ 532 /* Make the selected window's buffer current. */
diff --git a/src/xfont.c b/src/xfont.c
index ce32c7a2188..fdadb05500a 100644
--- a/src/xfont.c
+++ b/src/xfont.c
@@ -238,7 +238,7 @@ xfont_chars_supported (Lisp_Object chars, XFontStruct *xfont,
238 238
239static Lisp_Object xfont_scripts_cache; 239static Lisp_Object xfont_scripts_cache;
240 240
241/* Re-usable vector to store characteristic font properties. */ 241/* Reusable vector to store characteristic font properties. */
242static Lisp_Object xfont_scratch_props; 242static Lisp_Object xfont_scratch_props;
243 243
244/* Return a list of scripts supported by the font of FONTNAME whose 244/* Return a list of scripts supported by the font of FONTNAME whose
diff --git a/src/xterm.c b/src/xterm.c
index 6f335ea11da..2dd86e77631 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -12229,7 +12229,7 @@ x_dnd_process_quit (struct frame *f, Time timestamp)
12229/* This function is defined far away from the rest of the XDND code so 12229/* This function is defined far away from the rest of the XDND code so
12230 it can utilize `x_any_window_to_frame'. */ 12230 it can utilize `x_any_window_to_frame'. */
12231 12231
12232/* Implementors beware! On most other platforms (where drag-and-drop 12232/* Implementers beware! On most other platforms (where drag-and-drop
12233 data is not provided via selections, but some kind of serialization 12233 data is not provided via selections, but some kind of serialization
12234 mechanism), it is usually much easier to implement a suitable 12234 mechanism), it is usually much easier to implement a suitable
12235 primitive instead of copying the C code here, and then to build 12235 primitive instead of copying the C code here, and then to build