diff options
| author | Paul Eggert | 2011-11-19 18:29:42 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-11-19 18:29:42 -0800 |
| commit | e1dbe924b53c541fdf238a5a722b7177d5c8760b (patch) | |
| tree | cef637ee7849fac3160c668f88e0f761305f87d3 /src | |
| parent | 7fb18e9ef9edb3b47cf463babe83922f9310a473 (diff) | |
| download | emacs-e1dbe924b53c541fdf238a5a722b7177d5c8760b.tar.gz emacs-e1dbe924b53c541fdf238a5a722b7177d5c8760b.zip | |
Spelling fixes.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog.10 | 4 | ||||
| -rw-r--r-- | src/ChangeLog.11 | 16 | ||||
| -rw-r--r-- | src/ChangeLog.2 | 14 | ||||
| -rw-r--r-- | src/ChangeLog.3 | 2 | ||||
| -rw-r--r-- | src/ChangeLog.4 | 4 | ||||
| -rw-r--r-- | src/ChangeLog.5 | 2 | ||||
| -rw-r--r-- | src/ChangeLog.6 | 4 | ||||
| -rw-r--r-- | src/ChangeLog.7 | 2 | ||||
| -rw-r--r-- | src/ChangeLog.8 | 4 | ||||
| -rw-r--r-- | src/ccl.c | 2 | ||||
| -rw-r--r-- | src/character.c | 2 | ||||
| -rw-r--r-- | src/character.h | 2 | ||||
| -rw-r--r-- | src/dbusbind.c | 2 | ||||
| -rw-r--r-- | src/fileio.c | 4 | ||||
| -rw-r--r-- | src/fontset.c | 2 | ||||
| -rw-r--r-- | src/ftfont.c | 4 | ||||
| -rw-r--r-- | src/gtkutil.c | 4 | ||||
| -rw-r--r-- | src/image.c | 2 | ||||
| -rw-r--r-- | src/keyboard.c | 2 | ||||
| -rw-r--r-- | src/process.c | 2 | ||||
| -rw-r--r-- | src/w32.c | 4 | ||||
| -rw-r--r-- | src/w32console.c | 3 | ||||
| -rw-r--r-- | src/w32fns.c | 4 | ||||
| -rw-r--r-- | src/w32proc.c | 6 | ||||
| -rw-r--r-- | src/w32term.c | 4 | ||||
| -rw-r--r-- | src/w32xfns.c | 3 | ||||
| -rw-r--r-- | src/window.h | 2 | ||||
| -rw-r--r-- | src/xdisp.c | 6 | ||||
| -rw-r--r-- | src/xfns.c | 2 |
29 files changed, 56 insertions, 58 deletions
diff --git a/src/ChangeLog.10 b/src/ChangeLog.10 index 181b11b5a2b..1992ef96e0a 100644 --- a/src/ChangeLog.10 +++ b/src/ChangeLog.10 | |||
| @@ -6387,7 +6387,7 @@ | |||
| 6387 | 2005-11-20 Nick Roberts <nickrob@snap.net.nz> | 6387 | 2005-11-20 Nick Roberts <nickrob@snap.net.nz> |
| 6388 | 6388 | ||
| 6389 | * lisp.h: Use typedef when Lisp_Object is EMACS_INT so that | 6389 | * lisp.h: Use typedef when Lisp_Object is EMACS_INT so that |
| 6390 | this type is recognised when debugging. | 6390 | this type is recognized when debugging. |
| 6391 | 6391 | ||
| 6392 | 2005-11-19 Andreas Schwab <schwab@suse.de> | 6392 | 2005-11-19 Andreas Schwab <schwab@suse.de> |
| 6393 | 6393 | ||
| @@ -13398,7 +13398,7 @@ | |||
| 13398 | 2004-07-04 John Paul Wallington <jpw@gnu.org> | 13398 | 2004-07-04 John Paul Wallington <jpw@gnu.org> |
| 13399 | 13399 | ||
| 13400 | * fileio.c (read_file_name_completion_ignore_case): New variable. | 13400 | * fileio.c (read_file_name_completion_ignore_case): New variable. |
| 13401 | (syms_of_fileio): Declare and initialise it. | 13401 | (syms_of_fileio): Declare and initialize it. |
| 13402 | (Fread_file_name): Bind `completion-ignore-case' to respect it. | 13402 | (Fread_file_name): Bind `completion-ignore-case' to respect it. |
| 13403 | 13403 | ||
| 13404 | 2004-07-03 Eli Zaretskii <eliz@gnu.org> | 13404 | 2004-07-03 Eli Zaretskii <eliz@gnu.org> |
diff --git a/src/ChangeLog.11 b/src/ChangeLog.11 index f8b38554781..37a75c3c998 100644 --- a/src/ChangeLog.11 +++ b/src/ChangeLog.11 | |||
| @@ -5896,7 +5896,7 @@ | |||
| 5896 | * eval.c (Feval, Ffuncall): Use the new names. | 5896 | * eval.c (Feval, Ffuncall): Use the new names. |
| 5897 | 5897 | ||
| 5898 | * lisp.h (struct Lisp_Subr): Rename `am' to aMANY and add aUNEVALLED. | 5898 | * lisp.h (struct Lisp_Subr): Rename `am' to aMANY and add aUNEVALLED. |
| 5899 | (DEFUN): Add braces around the union initialisation and use ## to | 5899 | (DEFUN): Add braces around the union initialization and use ## to |
| 5900 | specify the right union alternative and avoid a cast. | 5900 | specify the right union alternative and avoid a cast. |
| 5901 | 5901 | ||
| 5902 | 2010-07-18 Juanma Barranquero <lekktu@gmail.com> | 5902 | 2010-07-18 Juanma Barranquero <lekktu@gmail.com> |
| @@ -9266,7 +9266,7 @@ | |||
| 9266 | 9266 | ||
| 9267 | Get rid of the direct_output optimizations. | 9267 | Get rid of the direct_output optimizations. |
| 9268 | * keyboard.c (nonundocount): Remove extern declaration. | 9268 | * keyboard.c (nonundocount): Remove extern declaration. |
| 9269 | (command_loop_1): Remove brittle optimisation for cheap and | 9269 | (command_loop_1): Remove brittle optimization for cheap and |
| 9270 | common operations. | 9270 | common operations. |
| 9271 | * xdisp.c (redisplay_internal): Don't bother checking | 9271 | * xdisp.c (redisplay_internal): Don't bother checking |
| 9272 | redisplay_performed_directly_p any more. | 9272 | redisplay_performed_directly_p any more. |
| @@ -12481,7 +12481,7 @@ | |||
| 12481 | 12481 | ||
| 12482 | * dbusbind.c (XD_SYMBOL_TO_DBUS_TYPE): Convert macro into function | 12482 | * dbusbind.c (XD_SYMBOL_TO_DBUS_TYPE): Convert macro into function |
| 12483 | xd_symbol_to_dbus_type. With Solaris 2.11, it was said to compile | 12483 | xd_symbol_to_dbus_type. With Solaris 2.11, it was said to compile |
| 12484 | for hours, when optimzation is enabled. | 12484 | for hours, when optimization is enabled. |
| 12485 | (xd_signature, xd_append_arg, xd_retrieve_arg, xd_initialize) | 12485 | (xd_signature, xd_append_arg, xd_retrieve_arg, xd_initialize) |
| 12486 | (xd_read_message): Make them static. | 12486 | (xd_read_message): Make them static. |
| 12487 | 12487 | ||
| @@ -16072,7 +16072,7 @@ | |||
| 16072 | 2008-09-07 Andreas Schwab <schwab@suse.de> | 16072 | 2008-09-07 Andreas Schwab <schwab@suse.de> |
| 16073 | 16073 | ||
| 16074 | * callproc.c (Fcall_process): Don't hold references to string data | 16074 | * callproc.c (Fcall_process): Don't hold references to string data |
| 16075 | across garbage collection. Move initialisation of new_argv down | 16075 | across garbage collection. Move initialization of new_argv down |
| 16076 | to avoid compiler bug. | 16076 | to avoid compiler bug. |
| 16077 | 16077 | ||
| 16078 | 2008-09-07 Roland Winkler <Roland.Winkler@physik.uni-erlangen.de> | 16078 | 2008-09-07 Roland Winkler <Roland.Winkler@physik.uni-erlangen.de> |
| @@ -19248,7 +19248,7 @@ | |||
| 19248 | * w32menu.c (Fx_popup_menu): Unwind protect while building menu. | 19248 | * w32menu.c (Fx_popup_menu): Unwind protect while building menu. |
| 19249 | (parse_single_submenu): Remove. | 19249 | (parse_single_submenu): Remove. |
| 19250 | (digest_single_submenu): Remove. | 19250 | (digest_single_submenu): Remove. |
| 19251 | (syms_of_w32menu): Don't initialise variables that have moved | 19251 | (syms_of_w32menu): Don't initialize variables that have moved |
| 19252 | to menu.c. | 19252 | to menu.c. |
| 19253 | (set_frame_menubar): Sync with version in xmenu.c. | 19253 | (set_frame_menubar): Sync with version in xmenu.c. |
| 19254 | (w32_menu_show): Sync with xmenu_show in xmenu.c. | 19254 | (w32_menu_show): Sync with xmenu_show in xmenu.c. |
| @@ -21290,7 +21290,7 @@ | |||
| 21290 | (CACHE_BLOCKSIZE): New constants. | 21290 | (CACHE_BLOCKSIZE): New constants. |
| 21291 | 21291 | ||
| 21292 | * w32font.c (Qja, Qko, Qzh): New symbols. | 21292 | * w32font.c (Qja, Qko, Qzh): New symbols. |
| 21293 | (syms_of_w32font): Initialise them. | 21293 | (syms_of_w32font): Initialize them. |
| 21294 | (font_matches_spec): Use them to filter by language. | 21294 | (font_matches_spec): Use them to filter by language. |
| 21295 | (recompute_cached_metrics): Remove function. | 21295 | (recompute_cached_metrics): Remove function. |
| 21296 | (compute_metrics, clear_cached_metrics): New functions. | 21296 | (compute_metrics, clear_cached_metrics): New functions. |
| @@ -29651,7 +29651,7 @@ | |||
| 29651 | 29651 | ||
| 29652 | * callproc.c (child_setup, getenv_internal): Use the | 29652 | * callproc.c (child_setup, getenv_internal): Use the |
| 29653 | display-environment-variable and term-environment-variable frame params. | 29653 | display-environment-variable and term-environment-variable frame params. |
| 29654 | (set_initial_environment): Initialise Vprocess_environment. | 29654 | (set_initial_environment): Initialize Vprocess_environment. |
| 29655 | 29655 | ||
| 29656 | * config.in: Disable multi-keyboard support on a mac. | 29656 | * config.in: Disable multi-keyboard support on a mac. |
| 29657 | 29657 | ||
| @@ -31298,7 +31298,7 @@ | |||
| 31298 | (term_mouse_highlight, term_mouse_movement, term_mouse_position) | 31298 | (term_mouse_highlight, term_mouse_movement, term_mouse_position) |
| 31299 | (term_mouse_click, handle_one_term_event, Fterm_open_connection) | 31299 | (term_mouse_click, handle_one_term_event, Fterm_open_connection) |
| 31300 | (Fterm_close_connection): New functions. | 31300 | (Fterm_close_connection): New functions. |
| 31301 | (term_init): Initialise mouse_face_window. | 31301 | (term_init): Initialize mouse_face_window. |
| 31302 | 31302 | ||
| 31303 | 2007-05-19 Chong Yidong <cyd@stupidchicken.com> | 31303 | 2007-05-19 Chong Yidong <cyd@stupidchicken.com> |
| 31304 | 31304 | ||
diff --git a/src/ChangeLog.2 b/src/ChangeLog.2 index 05e448c043c..62e3de22b09 100644 --- a/src/ChangeLog.2 +++ b/src/ChangeLog.2 | |||
| @@ -1152,7 +1152,7 @@ | |||
| 1152 | 1152 | ||
| 1153 | 1987-07-29 Richard Mlynarik (mly@prep) | 1153 | 1987-07-29 Richard Mlynarik (mly@prep) |
| 1154 | 1154 | ||
| 1155 | * lread.c (init_read): Initialise load_in_progress. | 1155 | * lread.c (init_read): Initialize load_in_progress. |
| 1156 | 1156 | ||
| 1157 | 1987-07-28 Richard M. Stallman (rms@prep) | 1157 | 1987-07-28 Richard M. Stallman (rms@prep) |
| 1158 | 1158 | ||
| @@ -2251,7 +2251,7 @@ | |||
| 2251 | 1987-01-16 Richard Mlynarik (mly@prep) | 2251 | 1987-01-16 Richard Mlynarik (mly@prep) |
| 2252 | 2252 | ||
| 2253 | * xfns.c (Fx_set_{background,cursor,mouse}_color): | 2253 | * xfns.c (Fx_set_{background,cursor,mouse}_color): |
| 2254 | Initialise save_color. | 2254 | Initialize save_color. |
| 2255 | 2255 | ||
| 2256 | * fileio.c, search.c, sysdep.c, filelock.c, editfns.c, process.c: | 2256 | * fileio.c, search.c, sysdep.c, filelock.c, editfns.c, process.c: |
| 2257 | Delete/replace unused/conditionalised variables | 2257 | Delete/replace unused/conditionalised variables |
| @@ -3002,7 +3002,7 @@ | |||
| 3002 | 1986-11-18 Richard Mlynarik (mly@prep) | 3002 | 1986-11-18 Richard Mlynarik (mly@prep) |
| 3003 | 3003 | ||
| 3004 | * emacs.c (main): | 3004 | * emacs.c (main): |
| 3005 | Giving `inhibit_x_windows' an initialisation loses; | 3005 | Giving `inhibit_x_windows' an initialization loses; |
| 3006 | do it explicitly. | 3006 | do it explicitly. |
| 3007 | 3007 | ||
| 3008 | * xfns.c (Fx_rubber_band): | 3008 | * xfns.c (Fx_rubber_band): |
| @@ -3291,7 +3291,7 @@ | |||
| 3291 | 1986-11-03 Richard Mlynarik (mly@prep) | 3291 | 1986-11-03 Richard Mlynarik (mly@prep) |
| 3292 | 3292 | ||
| 3293 | * xterm.c (stufflines): | 3293 | * xterm.c (stufflines): |
| 3294 | Initialise signal mask. | 3294 | Initialize signal mask. |
| 3295 | 3295 | ||
| 3296 | * xterm.h: | 3296 | * xterm.h: |
| 3297 | Add definition of sigmask | 3297 | Add definition of sigmask |
| @@ -3346,7 +3346,7 @@ | |||
| 3346 | New function. | 3346 | New function. |
| 3347 | 3347 | ||
| 3348 | * window.c (Fset_window_hscroll): | 3348 | * window.c (Fset_window_hscroll): |
| 3349 | Don't inhibit redisplay optimisations if hscroll is same. | 3349 | Don't inhibit redisplay optimizations if hscroll is same. |
| 3350 | 3350 | ||
| 3351 | * ymakefile: | 3351 | * ymakefile: |
| 3352 | rm ../etc/DOC to avoid make-docfile overwriting any files which | 3352 | rm ../etc/DOC to avoid make-docfile overwriting any files which |
| @@ -3358,7 +3358,7 @@ | |||
| 3358 | VMS changes from Sasaki | 3358 | VMS changes from Sasaki |
| 3359 | 3359 | ||
| 3360 | * termcap.c (tgetent): | 3360 | * termcap.c (tgetent): |
| 3361 | Make sure `indirect' initialised. | 3361 | Make sure `indirect' initialized. |
| 3362 | 3362 | ||
| 3363 | * xfns.c (grey_p and callers): | 3363 | * xfns.c (grey_p and callers): |
| 3364 | New function to compensate for ugly chauvinistic American | 3364 | New function to compensate for ugly chauvinistic American |
| @@ -3496,7 +3496,7 @@ | |||
| 3496 | core-dump) | 3496 | core-dump) |
| 3497 | 3497 | ||
| 3498 | Dike out global-minor-modes. This wasn't actually being used by | 3498 | Dike out global-minor-modes. This wasn't actually being used by |
| 3499 | anything (due to a bug) and wasn't even being initialised! | 3499 | anything (due to a bug) and wasn't even being initialized! |
| 3500 | minor-mode-alist does what this thought it was doing. | 3500 | minor-mode-alist does what this thought it was doing. |
| 3501 | 3501 | ||
| 3502 | 1986-10-11 Richard Mlynarik (mly@prep) | 3502 | 1986-10-11 Richard Mlynarik (mly@prep) |
diff --git a/src/ChangeLog.3 b/src/ChangeLog.3 index 9ce7828fac9..fb3ec172055 100644 --- a/src/ChangeLog.3 +++ b/src/ChangeLog.3 | |||
| @@ -9010,7 +9010,7 @@ | |||
| 9010 | * keyboard.c (cmd_error): If an error occurs before somebody has | 9010 | * keyboard.c (cmd_error): If an error occurs before somebody has |
| 9011 | provided a screen to print it on, print it to stderr and exit | 9011 | provided a screen to print it on, print it to stderr and exit |
| 9012 | Emacs. Handle batch-mode errors with the same code. | 9012 | Emacs. Handle batch-mode errors with the same code. |
| 9013 | * lisp.h (Qexternal_debugging_ouput): New extern declaration, for | 9013 | * lisp.h (Qexternal_debugging_output): New extern declaration, for |
| 9014 | use in cmd_error. | 9014 | use in cmd_error. |
| 9015 | 9015 | ||
| 9016 | * screen.c (Fscreen_pixel_size, Fset_screen_position): Doc fix. | 9016 | * screen.c (Fscreen_pixel_size, Fset_screen_position): Doc fix. |
diff --git a/src/ChangeLog.4 b/src/ChangeLog.4 index 208d9c2cdb0..88c9e3dbf71 100644 --- a/src/ChangeLog.4 +++ b/src/ChangeLog.4 | |||
| @@ -3656,7 +3656,7 @@ | |||
| 3656 | 3656 | ||
| 3657 | * m/delta.h (BROKEN_CLOSEDIR): Added because closedir is interruptible. | 3657 | * m/delta.h (BROKEN_CLOSEDIR): Added because closedir is interruptible. |
| 3658 | (HAVE_UNISTD_H): Deleted because configure takes care of it. | 3658 | (HAVE_UNISTD_H): Deleted because configure takes care of it. |
| 3659 | (C_SWITCH_MACHINE): Added optimisation options for gnu cc. | 3659 | (C_SWITCH_MACHINE): Added optimization options for gnu cc. |
| 3660 | 3660 | ||
| 3661 | 1993-12-17 Mike Long (mike.long@analog.com) | 3661 | 1993-12-17 Mike Long (mike.long@analog.com) |
| 3662 | 3662 | ||
| @@ -5007,7 +5007,7 @@ | |||
| 5007 | Change display code to handle the `invisible' text property. | 5007 | Change display code to handle the `invisible' text property. |
| 5008 | * dispnew.c (direct_output_for_insert): Fail if character | 5008 | * dispnew.c (direct_output_for_insert): Fail if character |
| 5009 | just inserted has text properties. | 5009 | just inserted has text properties. |
| 5010 | (direct_ouput_forward_char): Fail if moving near invisible chars. | 5010 | (direct_output_forward_char): Fail if moving near invisible chars. |
| 5011 | * indent.c (compute_motion): Compute correctly for invisible text. | 5011 | * indent.c (compute_motion): Compute correctly for invisible text. |
| 5012 | (vmotion): Take care of invisible newlines. | 5012 | (vmotion): Take care of invisible newlines. |
| 5013 | * intervals.c (set_point): Ignore `invisible' property | 5013 | * intervals.c (set_point): Ignore `invisible' property |
diff --git a/src/ChangeLog.5 b/src/ChangeLog.5 index 1f21e9fb99c..ee79917a34d 100644 --- a/src/ChangeLog.5 +++ b/src/ChangeLog.5 | |||
| @@ -3463,7 +3463,7 @@ | |||
| 3463 | 3463 | ||
| 3464 | * lisp.h (running_asynch_code): New global flag. | 3464 | * lisp.h (running_asynch_code): New global flag. |
| 3465 | * emacs.c (running_asynch_code): New global flag. | 3465 | * emacs.c (running_asynch_code): New global flag. |
| 3466 | (main): Initialise it. | 3466 | (main): Initialize it. |
| 3467 | * process.c (read_process_output, exec_sentinel): Set and | 3467 | * process.c (read_process_output, exec_sentinel): Set and |
| 3468 | reset the running_asynch_code global flag and restore match data. | 3468 | reset the running_asynch_code global flag and restore match data. |
| 3469 | 3469 | ||
diff --git a/src/ChangeLog.6 b/src/ChangeLog.6 index 141a570040c..af97d0de7b4 100644 --- a/src/ChangeLog.6 +++ b/src/ChangeLog.6 | |||
| @@ -1182,7 +1182,7 @@ | |||
| 1182 | support in sys_select. | 1182 | support in sys_select. |
| 1183 | 1183 | ||
| 1184 | (term_ntproc): New function. | 1184 | (term_ntproc): New function. |
| 1185 | (init_ntproc): New function to initialise socket support and make | 1185 | (init_ntproc): New function to initialize socket support and make |
| 1186 | initial std handles non-inheritable. Also ensure stdin, stdout | 1186 | initial std handles non-inheritable. Also ensure stdin, stdout |
| 1187 | and stderr have valid handles so that pipes and sockets can't | 1187 | and stderr have valid handles so that pipes and sockets can't |
| 1188 | inadvertently use fd 0, 1, or 2. | 1188 | inadvertently use fd 0, 1, or 2. |
| @@ -1440,7 +1440,7 @@ | |||
| 1440 | Correctly detect when default_directory is absolute. | 1440 | Correctly detect when default_directory is absolute. |
| 1441 | Be strict when looking for MSDOS drive specifier; defer calling | 1441 | Be strict when looking for MSDOS drive specifier; defer calling |
| 1442 | getdefdir. Ignore drive specifier if name now has UNC prefix. | 1442 | getdefdir. Ignore drive specifier if name now has UNC prefix. |
| 1443 | Correctly recognise if name is not absolute when trying simple | 1443 | Correctly recognize if name is not absolute when trying simple |
| 1444 | method to expand; return original string if possible. | 1444 | method to expand; return original string if possible. |
| 1445 | Skip dir sep after ~ or ~user. | 1445 | Skip dir sep after ~ or ~user. |
| 1446 | Use getpwnam instead of HOME for ~user on NT. | 1446 | Use getpwnam instead of HOME for ~user on NT. |
diff --git a/src/ChangeLog.7 b/src/ChangeLog.7 index 73d0d45e9c1..ec4c27a4d9e 100644 --- a/src/ChangeLog.7 +++ b/src/ChangeLog.7 | |||
| @@ -10963,7 +10963,7 @@ | |||
| 10963 | 1996-08-28 Morten Welinder <terra@diku.dk> | 10963 | 1996-08-28 Morten Welinder <terra@diku.dk> |
| 10964 | 10964 | ||
| 10965 | * minibuf.c (Vhistory_length, Qhistory_length): New variables. | 10965 | * minibuf.c (Vhistory_length, Qhistory_length): New variables. |
| 10966 | (syms_of_minibuf): Register and initialise these. | 10966 | (syms_of_minibuf): Register and initialize these. |
| 10967 | (read_minibuf): Truncate history list if needed. | 10967 | (read_minibuf): Truncate history list if needed. |
| 10968 | 10968 | ||
| 10969 | 1996-08-28 Richard Stallman <rms@psilocin.gnu.ai.mit.edu> | 10969 | 1996-08-28 Richard Stallman <rms@psilocin.gnu.ai.mit.edu> |
diff --git a/src/ChangeLog.8 b/src/ChangeLog.8 index 00e4a1f62c8..bd51e55cdc6 100644 --- a/src/ChangeLog.8 +++ b/src/ChangeLog.8 | |||
| @@ -13266,7 +13266,7 @@ | |||
| 13266 | 13266 | ||
| 13267 | * charset.c (Fchar_bytes): Doc fix. | 13267 | * charset.c (Fchar_bytes): Doc fix. |
| 13268 | (char_bytes): Fix returned value to match returned type. | 13268 | (char_bytes): Fix returned value to match returned type. |
| 13269 | (syms_of_charset): Fix type clash in initialisation of | 13269 | (syms_of_charset): Fix type clash in initialization of |
| 13270 | Vauto_fill_chars. | 13270 | Vauto_fill_chars. |
| 13271 | 13271 | ||
| 13272 | 1998-10-29 Geoff Voelker <voelker@cs.washington.edu> | 13272 | 1998-10-29 Geoff Voelker <voelker@cs.washington.edu> |
| @@ -13429,7 +13429,7 @@ | |||
| 13429 | `x-list-fonts.c'. | 13429 | `x-list-fonts.c'. |
| 13430 | (w32_get_font_info, w32_query_font, w32_find_ccl_program): New | 13430 | (w32_get_font_info, w32_query_font, w32_find_ccl_program): New |
| 13431 | functions for fontset support - adapted from x_ equivalents. | 13431 | functions for fontset support - adapted from x_ equivalents. |
| 13432 | (syms_of_w32fns): New lisp variables initialised. Function | 13432 | (syms_of_w32fns): New lisp variables initialized. Function |
| 13433 | pointers for fontset.c set up. | 13433 | pointers for fontset.c set up. |
| 13434 | 13434 | ||
| 13435 | * w32term.c: Include fontset.h. Define codepage macros. | 13435 | * w32term.c: Include fontset.h. Define codepage macros. |
| @@ -47,7 +47,7 @@ static Lisp_Object Qcode_conversion_map; | |||
| 47 | static Lisp_Object Qcode_conversion_map_id; | 47 | static Lisp_Object Qcode_conversion_map_id; |
| 48 | 48 | ||
| 49 | /* Symbols of ccl program have this property, a value of the property | 49 | /* Symbols of ccl program have this property, a value of the property |
| 50 | is an index for Vccl_protram_table. */ | 50 | is an index for Vccl_program_table. */ |
| 51 | static Lisp_Object Qccl_program_idx; | 51 | static Lisp_Object Qccl_program_idx; |
| 52 | 52 | ||
| 53 | /* Table of registered CCL programs. Each element is a vector of | 53 | /* Table of registered CCL programs. Each element is a vector of |
diff --git a/src/character.c b/src/character.c index a21760c8ab2..88b1f11b96b 100644 --- a/src/character.c +++ b/src/character.c | |||
| @@ -669,7 +669,7 @@ str_as_multibyte (unsigned char *str, EMACS_INT len, EMACS_INT nbytes, | |||
| 669 | } | 669 | } |
| 670 | 670 | ||
| 671 | /* Parse unibyte string at STR of LEN bytes, and return the number of | 671 | /* Parse unibyte string at STR of LEN bytes, and return the number of |
| 672 | bytes it may ocupy when converted to multibyte string by | 672 | bytes it may occupy when converted to multibyte string by |
| 673 | `str_to_multibyte'. */ | 673 | `str_to_multibyte'. */ |
| 674 | 674 | ||
| 675 | EMACS_INT | 675 | EMACS_INT |
diff --git a/src/character.h b/src/character.h index 09bcf17ab96..5ae6cb8c49c 100644 --- a/src/character.h +++ b/src/character.h | |||
| @@ -596,7 +596,7 @@ sanitize_char_width (EMACS_INT width) | |||
| 596 | ? ASCII_CHAR_WIDTH (c) \ | 596 | ? ASCII_CHAR_WIDTH (c) \ |
| 597 | : sanitize_char_width (XINT (CHAR_TABLE_REF (Vchar_width_table, c)))) | 597 | : sanitize_char_width (XINT (CHAR_TABLE_REF (Vchar_width_table, c)))) |
| 598 | 598 | ||
| 599 | /* If C is a variation selector, return the index numnber of the | 599 | /* If C is a variation selector, return the index of the |
| 600 | variation selector (1..256). Otherwise, return 0. */ | 600 | variation selector (1..256). Otherwise, return 0. */ |
| 601 | 601 | ||
| 602 | #define CHAR_VARIATION_SELECTOR_P(c) \ | 602 | #define CHAR_VARIATION_SELECTOR_P(c) \ |
diff --git a/src/dbusbind.c b/src/dbusbind.c index 52e08d8ee2a..7984be3564b 100644 --- a/src/dbusbind.c +++ b/src/dbusbind.c | |||
| @@ -184,7 +184,7 @@ static int xd_in_read_queued_messages = 0; | |||
| 184 | #endif | 184 | #endif |
| 185 | 185 | ||
| 186 | /* This was a macro. On Solaris 2.11 it was said to compile for | 186 | /* This was a macro. On Solaris 2.11 it was said to compile for |
| 187 | hours, when optimzation is enabled. So we have transferred it into | 187 | hours, when optimization is enabled. So we have transferred it into |
| 188 | a function. */ | 188 | a function. */ |
| 189 | /* Determine the DBusType of a given Lisp symbol. OBJECT must be one | 189 | /* Determine the DBusType of a given Lisp symbol. OBJECT must be one |
| 190 | of the predefined D-Bus type symbols. */ | 190 | of the predefined D-Bus type symbols. */ |
diff --git a/src/fileio.c b/src/fileio.c index 54fc67e6631..e3586c50056 100644 --- a/src/fileio.c +++ b/src/fileio.c | |||
| @@ -338,7 +338,7 @@ Given a Unix syntax file name, returns a string ending in slash. */) | |||
| 338 | 338 | ||
| 339 | while (p != beg && !IS_DIRECTORY_SEP (p[-1]) | 339 | while (p != beg && !IS_DIRECTORY_SEP (p[-1]) |
| 340 | #ifdef DOS_NT | 340 | #ifdef DOS_NT |
| 341 | /* only recognise drive specifier at the beginning */ | 341 | /* only recognize drive specifier at the beginning */ |
| 342 | && !(p[-1] == ':' | 342 | && !(p[-1] == ':' |
| 343 | /* handle the "/:d:foo" and "/:foo" cases correctly */ | 343 | /* handle the "/:d:foo" and "/:foo" cases correctly */ |
| 344 | && ((p == beg + 2 && !IS_DIRECTORY_SEP (*beg)) | 344 | && ((p == beg + 2 && !IS_DIRECTORY_SEP (*beg)) |
| @@ -401,7 +401,7 @@ or the entire name if it contains no slash. */) | |||
| 401 | 401 | ||
| 402 | while (p != beg && !IS_DIRECTORY_SEP (p[-1]) | 402 | while (p != beg && !IS_DIRECTORY_SEP (p[-1]) |
| 403 | #ifdef DOS_NT | 403 | #ifdef DOS_NT |
| 404 | /* only recognise drive specifier at beginning */ | 404 | /* only recognize drive specifier at beginning */ |
| 405 | && !(p[-1] == ':' | 405 | && !(p[-1] == ':' |
| 406 | /* handle the "/:d:foo" case correctly */ | 406 | /* handle the "/:d:foo" case correctly */ |
| 407 | && (p == beg + 2 || (p == beg + 4 && IS_DIRECTORY_SEP (*beg)))) | 407 | && (p == beg + 2 || (p == beg + 4 && IS_DIRECTORY_SEP (*beg)))) |
diff --git a/src/fontset.c b/src/fontset.c index 34b2131832f..e20d7957c7f 100644 --- a/src/fontset.c +++ b/src/fontset.c | |||
| @@ -1346,7 +1346,7 @@ accumulate_script_ranges (Lisp_Object arg, Lisp_Object range, Lisp_Object val) | |||
| 1346 | 1346 | ||
| 1347 | In FONTSET, set FONT_DEF in a fashion specified by ADD for | 1347 | In FONTSET, set FONT_DEF in a fashion specified by ADD for |
| 1348 | characters in RANGE and ranges in SCRIPT_RANGE_LIST before RANGE. | 1348 | characters in RANGE and ranges in SCRIPT_RANGE_LIST before RANGE. |
| 1349 | The consumed ranges are poped up from SCRIPT_RANGE_LIST, and the | 1349 | The consumed ranges are popped up from SCRIPT_RANGE_LIST, and the |
| 1350 | new SCRIPT_RANGE_LIST is stored in ARG. | 1350 | new SCRIPT_RANGE_LIST is stored in ARG. |
| 1351 | 1351 | ||
| 1352 | If ASCII is nil, don't set FONT_DEF for ASCII characters. It is | 1352 | If ASCII is nil, don't set FONT_DEF for ASCII characters. It is |
diff --git a/src/ftfont.c b/src/ftfont.c index 7858a31be21..5c540f9bf82 100644 --- a/src/ftfont.c +++ b/src/ftfont.c | |||
| @@ -272,7 +272,7 @@ ftfont_pattern_entity (FcPattern *p, Lisp_Object extra) | |||
| 272 | } | 272 | } |
| 273 | else | 273 | else |
| 274 | { | 274 | { |
| 275 | /* As this font is not scalable, parhaps this is a BDF or PCF | 275 | /* As this font is not scalable, perhaps this is a BDF or PCF |
| 276 | font. */ | 276 | font. */ |
| 277 | FT_Face ft_face; | 277 | FT_Face ft_face; |
| 278 | 278 | ||
| @@ -730,7 +730,7 @@ ftfont_spec_pattern (Lisp_Object spec, char *otlayout, struct OpenTypeSpec **ots | |||
| 730 | 730 | ||
| 731 | if ((n = FONT_SLANT_NUMERIC (spec)) >= 0 | 731 | if ((n = FONT_SLANT_NUMERIC (spec)) >= 0 |
| 732 | && n < 100) | 732 | && n < 100) |
| 733 | /* Fontconfig doesn't support reverse-italic/obligue. */ | 733 | /* Fontconfig doesn't support reverse-italic/oblique. */ |
| 734 | return NULL; | 734 | return NULL; |
| 735 | 735 | ||
| 736 | if (INTEGERP (AREF (spec, FONT_DPI_INDEX))) | 736 | if (INTEGERP (AREF (spec, FONT_DPI_INDEX))) |
diff --git a/src/gtkutil.c b/src/gtkutil.c index 59bcdfa4afd..3df46afcd3a 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c | |||
| @@ -127,7 +127,7 @@ xg_set_screen (GtkWidget *w, FRAME_PTR f) | |||
| 127 | 127 | ||
| 128 | Returns non-zero if display could be opened, zero if display could not | 128 | Returns non-zero if display could be opened, zero if display could not |
| 129 | be opened, and less than zero if the GTK version doesn't support | 129 | be opened, and less than zero if the GTK version doesn't support |
| 130 | multipe displays. */ | 130 | multiple displays. */ |
| 131 | 131 | ||
| 132 | void | 132 | void |
| 133 | xg_display_open (char *display_name, Display **dpy) | 133 | xg_display_open (char *display_name, Display **dpy) |
| @@ -4262,7 +4262,7 @@ xg_make_tool_item (FRAME_PTR f, | |||
| 4262 | #endif | 4262 | #endif |
| 4263 | gtk_tool_item_set_homogeneous (ti, FALSE); | 4263 | gtk_tool_item_set_homogeneous (ti, FALSE); |
| 4264 | 4264 | ||
| 4265 | /* Callback to save modifyer mask (Shift/Control, etc). GTK makes | 4265 | /* Callback to save modifier mask (Shift/Control, etc). GTK makes |
| 4266 | no distinction based on modifiers in the activate callback, | 4266 | no distinction based on modifiers in the activate callback, |
| 4267 | so we have to do it ourselves. */ | 4267 | so we have to do it ourselves. */ |
| 4268 | g_signal_connect (wb, "button-release-event", | 4268 | g_signal_connect (wb, "button-release-event", |
diff --git a/src/image.c b/src/image.c index a82b16aa805..8b61c7eefbc 100644 --- a/src/image.c +++ b/src/image.c | |||
| @@ -7754,7 +7754,7 @@ imagemagick_load_image (struct frame *f, struct image *img, | |||
| 7754 | } | 7754 | } |
| 7755 | 7755 | ||
| 7756 | /* Finally we are done manipulating the image. Figure out the | 7756 | /* Finally we are done manipulating the image. Figure out the |
| 7757 | resulting width/height and transfer ownerwship to Emacs. */ | 7757 | resulting width/height and transfer ownership to Emacs. */ |
| 7758 | height = MagickGetImageHeight (image_wand); | 7758 | height = MagickGetImageHeight (image_wand); |
| 7759 | width = MagickGetImageWidth (image_wand); | 7759 | width = MagickGetImageWidth (image_wand); |
| 7760 | 7760 | ||
diff --git a/src/keyboard.c b/src/keyboard.c index a4c85683061..80873fcb57a 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -12100,7 +12100,7 @@ This variable is keyboard-local. */); | |||
| 12100 | Function key definitions that apply to all terminal devices should go | 12100 | Function key definitions that apply to all terminal devices should go |
| 12101 | here. If a mapping is defined in both the current | 12101 | here. If a mapping is defined in both the current |
| 12102 | `local-function-key-map' binding and this variable, then the local | 12102 | `local-function-key-map' binding and this variable, then the local |
| 12103 | definition will take precendence. */); | 12103 | definition will take precedence. */); |
| 12104 | Vfunction_key_map = Fmake_sparse_keymap (Qnil); | 12104 | Vfunction_key_map = Fmake_sparse_keymap (Qnil); |
| 12105 | 12105 | ||
| 12106 | DEFVAR_LISP ("key-translation-map", Vkey_translation_map, | 12106 | DEFVAR_LISP ("key-translation-map", Vkey_translation_map, |
diff --git a/src/process.c b/src/process.c index 53382d804f2..bea9e72019b 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -1414,7 +1414,7 @@ usage: (start-process NAME BUFFER PROGRAM &rest PROGRAM-ARGS) */) | |||
| 1414 | val = XCDR (Vdefault_process_coding_system); | 1414 | val = XCDR (Vdefault_process_coding_system); |
| 1415 | } | 1415 | } |
| 1416 | XPROCESS (proc)->encode_coding_system = val; | 1416 | XPROCESS (proc)->encode_coding_system = val; |
| 1417 | /* Note: At this momemnt, the above coding system may leave | 1417 | /* Note: At this moment, the above coding system may leave |
| 1418 | text-conversion or eol-conversion unspecified. They will be | 1418 | text-conversion or eol-conversion unspecified. They will be |
| 1419 | decided after we read output from the process and decode it by | 1419 | decided after we read output from the process and decode it by |
| 1420 | some coding system, or just before we actually send a text to | 1420 | some coding system, or just before we actually send a text to |
| @@ -3057,7 +3057,7 @@ generate_inode_val (const char * name) | |||
| 3057 | unsigned hash; | 3057 | unsigned hash; |
| 3058 | 3058 | ||
| 3059 | /* Get the truly canonical filename, if it exists. (Note: this | 3059 | /* Get the truly canonical filename, if it exists. (Note: this |
| 3060 | doesn't resolve aliasing due to subst commands, or recognise hard | 3060 | doesn't resolve aliasing due to subst commands, or recognize hard |
| 3061 | links. */ | 3061 | links. */ |
| 3062 | if (!w32_get_long_filename ((char *)name, fullname, MAX_PATH)) | 3062 | if (!w32_get_long_filename ((char *)name, fullname, MAX_PATH)) |
| 3063 | abort (); | 3063 | abort (); |
| @@ -5845,7 +5845,7 @@ term_ntproc (void) | |||
| 5845 | void | 5845 | void |
| 5846 | init_ntproc (void) | 5846 | init_ntproc (void) |
| 5847 | { | 5847 | { |
| 5848 | /* Initialise the socket interface now if available and requested by | 5848 | /* Initialize the socket interface now if available and requested by |
| 5849 | the user by defining PRELOAD_WINSOCK; otherwise loading will be | 5849 | the user by defining PRELOAD_WINSOCK; otherwise loading will be |
| 5850 | delayed until open-network-stream is called (w32-has-winsock can | 5850 | delayed until open-network-stream is called (w32-has-winsock can |
| 5851 | also be used to dynamically load or reload winsock). | 5851 | also be used to dynamically load or reload winsock). |
diff --git a/src/w32console.c b/src/w32console.c index 49bf56ddee9..30c71f1c276 100644 --- a/src/w32console.c +++ b/src/w32console.c | |||
| @@ -748,7 +748,7 @@ syms_of_ntterm (void) | |||
| 748 | doc: /* Non-nil means make terminal frames use the full screen buffer dimensions. | 748 | doc: /* Non-nil means make terminal frames use the full screen buffer dimensions. |
| 749 | This is desirable when running Emacs over telnet. | 749 | This is desirable when running Emacs over telnet. |
| 750 | A value of nil means use the current console window dimensions; this | 750 | A value of nil means use the current console window dimensions; this |
| 751 | may be preferrable when working directly at the console with a large | 751 | may be preferable when working directly at the console with a large |
| 752 | scroll-back buffer. */); | 752 | scroll-back buffer. */); |
| 753 | w32_use_full_screen_buffer = 0; | 753 | w32_use_full_screen_buffer = 0; |
| 754 | 754 | ||
| @@ -757,4 +757,3 @@ scroll-back buffer. */); | |||
| 757 | defsubr (&Sset_cursor_size); | 757 | defsubr (&Sset_cursor_size); |
| 758 | defsubr (&Sset_message_beep); | 758 | defsubr (&Sset_message_beep); |
| 759 | } | 759 | } |
| 760 | |||
diff --git a/src/w32fns.c b/src/w32fns.c index 4a6da46141c..5b936195aa5 100644 --- a/src/w32fns.c +++ b/src/w32fns.c | |||
| @@ -2262,7 +2262,7 @@ w32_msg_pump (deferred_msg * msg_buf) | |||
| 2262 | some third party shell extensions can cause it to be used in | 2262 | some third party shell extensions can cause it to be used in |
| 2263 | system dialogs, which causes a crash if it is not initialized. | 2263 | system dialogs, which causes a crash if it is not initialized. |
| 2264 | This is a known bug in Windows, which was fixed long ago, but | 2264 | This is a known bug in Windows, which was fixed long ago, but |
| 2265 | the patch for XP is not publically available until XP SP3, | 2265 | the patch for XP is not publicly available until XP SP3, |
| 2266 | and older versions will never be patched. */ | 2266 | and older versions will never be patched. */ |
| 2267 | CoInitialize (NULL); | 2267 | CoInitialize (NULL); |
| 2268 | w32_createwindow ((struct frame *) msg.wParam); | 2268 | w32_createwindow ((struct frame *) msg.wParam); |
| @@ -2880,7 +2880,7 @@ w32_wnd_proc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) | |||
| 2880 | key.dwControlKeyState = modifiers; | 2880 | key.dwControlKeyState = modifiers; |
| 2881 | 2881 | ||
| 2882 | add = w32_kbd_patch_key (&key); | 2882 | add = w32_kbd_patch_key (&key); |
| 2883 | /* 0 means an unrecognised keycode, negative means | 2883 | /* 0 means an unrecognized keycode, negative means |
| 2884 | dead key. Ignore both. */ | 2884 | dead key. Ignore both. */ |
| 2885 | while (--add >= 0) | 2885 | while (--add >= 0) |
| 2886 | { | 2886 | { |
diff --git a/src/w32proc.c b/src/w32proc.c index 279816bcc3e..254a32503c4 100644 --- a/src/w32proc.c +++ b/src/w32proc.c | |||
| @@ -122,12 +122,12 @@ new_child (void) | |||
| 122 | 122 | ||
| 123 | for (cp = child_procs + (child_proc_count-1); cp >= child_procs; cp--) | 123 | for (cp = child_procs + (child_proc_count-1); cp >= child_procs; cp--) |
| 124 | if (!CHILD_ACTIVE (cp)) | 124 | if (!CHILD_ACTIVE (cp)) |
| 125 | goto Initialise; | 125 | goto Initialize; |
| 126 | if (child_proc_count == MAX_CHILDREN) | 126 | if (child_proc_count == MAX_CHILDREN) |
| 127 | return NULL; | 127 | return NULL; |
| 128 | cp = &child_procs[child_proc_count++]; | 128 | cp = &child_procs[child_proc_count++]; |
| 129 | 129 | ||
| 130 | Initialise: | 130 | Initialize: |
| 131 | memset (cp, 0, sizeof (*cp)); | 131 | memset (cp, 0, sizeof (*cp)); |
| 132 | cp->fd = -1; | 132 | cp->fd = -1; |
| 133 | cp->pid = -1; | 133 | cp->pid = -1; |
| @@ -821,7 +821,7 @@ sys_spawnve (int mode, char *cmdname, char **argv, char **envp) | |||
| 821 | 821 | ||
| 822 | The w32 GNU-based library from Cygnus doubles quotes to escape | 822 | The w32 GNU-based library from Cygnus doubles quotes to escape |
| 823 | them, while MSVC uses backslash for escaping. (Actually the MSVC | 823 | them, while MSVC uses backslash for escaping. (Actually the MSVC |
| 824 | startup code does attempt to recognise doubled quotes and accept | 824 | startup code does attempt to recognize doubled quotes and accept |
| 825 | them, but gets it wrong and ends up requiring three quotes to get a | 825 | them, but gets it wrong and ends up requiring three quotes to get a |
| 826 | single embedded quote!) So by default we decide whether to use | 826 | single embedded quote!) So by default we decide whether to use |
| 827 | quote or backslash as the escape character based on whether the | 827 | quote or backslash as the escape character based on whether the |
diff --git a/src/w32term.c b/src/w32term.c index 18f5b85367c..a2ccdd21f7d 100644 --- a/src/w32term.c +++ b/src/w32term.c | |||
| @@ -5576,7 +5576,7 @@ x_raise_frame (struct frame *f) | |||
| 5576 | input focus anyway (so the window with focus will never be | 5576 | input focus anyway (so the window with focus will never be |
| 5577 | completely obscured) - if not, then just moving the mouse over it | 5577 | completely obscured) - if not, then just moving the mouse over it |
| 5578 | is sufficient to give it focus. On Windows, the user must actually | 5578 | is sufficient to give it focus. On Windows, the user must actually |
| 5579 | click on the frame (preferrably the title bar so as not to move | 5579 | click on the frame (preferably the title bar so as not to move |
| 5580 | point), which is more awkward. Also, no other Windows program | 5580 | point), which is more awkward. Also, no other Windows program |
| 5581 | raises a window to the top but leaves another window (possibly now | 5581 | raises a window to the top but leaves another window (possibly now |
| 5582 | completely obscured) with input focus. | 5582 | completely obscured) with input focus. |
| @@ -6164,7 +6164,7 @@ w32_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name) | |||
| 6164 | dpyinfo->has_palette = GetDeviceCaps (hdc, RASTERCAPS) & RC_PALETTE; | 6164 | dpyinfo->has_palette = GetDeviceCaps (hdc, RASTERCAPS) & RC_PALETTE; |
| 6165 | ReleaseDC (NULL, hdc); | 6165 | ReleaseDC (NULL, hdc); |
| 6166 | 6166 | ||
| 6167 | /* initialise palette with white and black */ | 6167 | /* initialize palette with white and black */ |
| 6168 | { | 6168 | { |
| 6169 | XColor color; | 6169 | XColor color; |
| 6170 | w32_defined_color (0, "white", &color, 1); | 6170 | w32_defined_color (0, "white", &color, 1); |
diff --git a/src/w32xfns.c b/src/w32xfns.c index fbbf11bd65c..fc2d5904d67 100644 --- a/src/w32xfns.c +++ b/src/w32xfns.c | |||
| @@ -188,7 +188,7 @@ get_next_msg (W32Msg * lpmsg, BOOL bWait) | |||
| 188 | } | 188 | } |
| 189 | 189 | ||
| 190 | nQueue--; | 190 | nQueue--; |
| 191 | /* Consolidate WM_PAINT messages to optimise redrawing. */ | 191 | /* Consolidate WM_PAINT messages to optimize redrawing. */ |
| 192 | if (lpmsg->msg.message == WM_PAINT && nQueue) | 192 | if (lpmsg->msg.message == WM_PAINT && nQueue) |
| 193 | { | 193 | { |
| 194 | int_msg * lpCur = lpHead; | 194 | int_msg * lpCur = lpHead; |
| @@ -441,4 +441,3 @@ void | |||
| 441 | x_sync (void *f) | 441 | x_sync (void *f) |
| 442 | { | 442 | { |
| 443 | } | 443 | } |
| 444 | |||
diff --git a/src/window.h b/src/window.h index de0f7307a51..df29ca1368f 100644 --- a/src/window.h +++ b/src/window.h | |||
| @@ -268,7 +268,7 @@ struct window | |||
| 268 | /* List of buffers re-shown in this window. */ | 268 | /* List of buffers re-shown in this window. */ |
| 269 | Lisp_Object next_buffers; | 269 | Lisp_Object next_buffers; |
| 270 | 270 | ||
| 271 | /* An alist with parameteres. */ | 271 | /* An alist with parameters. */ |
| 272 | Lisp_Object window_parameters; | 272 | Lisp_Object window_parameters; |
| 273 | 273 | ||
| 274 | /* No Lisp data may follow below this point without changing | 274 | /* No Lisp data may follow below this point without changing |
diff --git a/src/xdisp.c b/src/xdisp.c index bc7a7a053db..8a8c1d08994 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -1445,7 +1445,7 @@ pos_visible_p (struct window *w, EMACS_INT charpos, int *x, int *y, | |||
| 1445 | position is CHARPOS. For the contingency that we | 1445 | position is CHARPOS. For the contingency that we |
| 1446 | didn't, and stopped at the first newline from the | 1446 | didn't, and stopped at the first newline from the |
| 1447 | display string, move back over the glyphs | 1447 | display string, move back over the glyphs |
| 1448 | prfoduced from the string, until we find the | 1448 | produced from the string, until we find the |
| 1449 | rightmost glyph not from the string. */ | 1449 | rightmost glyph not from the string. */ |
| 1450 | if (IT_CHARPOS (it3) != charpos && EQ (it3.object, string)) | 1450 | if (IT_CHARPOS (it3) != charpos && EQ (it3.object, string)) |
| 1451 | { | 1451 | { |
| @@ -14109,7 +14109,7 @@ set_cursor_from_row (struct window *w, struct glyph_row *row, | |||
| 14109 | || (STRINGP (g1->object) | 14109 | || (STRINGP (g1->object) |
| 14110 | && (!NILP (Fget_char_property (make_number (g1->charpos), | 14110 | && (!NILP (Fget_char_property (make_number (g1->charpos), |
| 14111 | Qcursor, g1->object)) | 14111 | Qcursor, g1->object)) |
| 14112 | /* pevious candidate is from the same display | 14112 | /* previous candidate is from the same display |
| 14113 | string as this one, and the display string | 14113 | string as this one, and the display string |
| 14114 | came from a text property */ | 14114 | came from a text property */ |
| 14115 | || (EQ (g1->object, glyph->object) | 14115 | || (EQ (g1->object, glyph->object) |
| @@ -17020,7 +17020,7 @@ try_window_id (struct window *w) | |||
| 17020 | last_unchanged_at_beg_row = find_last_unchanged_at_beg_row (w); | 17020 | last_unchanged_at_beg_row = find_last_unchanged_at_beg_row (w); |
| 17021 | if (last_unchanged_at_beg_row) | 17021 | if (last_unchanged_at_beg_row) |
| 17022 | { | 17022 | { |
| 17023 | /* Avoid starting to display in the moddle of a character, a TAB | 17023 | /* Avoid starting to display in the middle of a character, a TAB |
| 17024 | for instance. This is easier than to set up the iterator | 17024 | for instance. This is easier than to set up the iterator |
| 17025 | exactly, and it's not a frequent case, so the additional | 17025 | exactly, and it's not a frequent case, so the additional |
| 17026 | effort wouldn't really pay off. */ | 17026 | effort wouldn't really pay off. */ |
diff --git a/src/xfns.c b/src/xfns.c index 6de412c4e68..88e8ac595c5 100644 --- a/src/xfns.c +++ b/src/xfns.c | |||
| @@ -2962,7 +2962,7 @@ x_default_font_parameter (struct frame *f, Lisp_Object parms) | |||
| 2962 | 2962 | ||
| 2963 | if (NILP (font_param)) | 2963 | if (NILP (font_param)) |
| 2964 | { | 2964 | { |
| 2965 | /* System font should take precedendce over X resources. We suggest this | 2965 | /* System font should take precedence over X resources. We suggest this |
| 2966 | regardless of font-use-system-font because .emacs may not have been | 2966 | regardless of font-use-system-font because .emacs may not have been |
| 2967 | read yet. */ | 2967 | read yet. */ |
| 2968 | const char *system_font = xsettings_get_system_font (); | 2968 | const char *system_font = xsettings_get_system_font (); |