diff options
| author | Stefan Kangas | 2023-12-10 13:22:04 +0100 |
|---|---|---|
| committer | Stefan Kangas | 2023-12-10 13:22:04 +0100 |
| commit | 06a12b0cccbda419752f3388346be7d302ebcbeb (patch) | |
| tree | 69c3a4c23638553993a7580cae4a4d597fd8e258 | |
| parent | 1d5028ad0414cad458aac1102d3612e4956068c5 (diff) | |
| download | emacs-06a12b0cccbda419752f3388346be7d302ebcbeb.tar.gz emacs-06a12b0cccbda419752f3388346be7d302ebcbeb.zip | |
; Fix typos
77 files changed, 148 insertions, 148 deletions
diff --git a/ChangeLog.android b/ChangeLog.android index 8cc66c4d7ea..96419ebe351 100644 --- a/ChangeLog.android +++ b/ChangeLog.android | |||
| @@ -700,7 +700,7 @@ | |||
| 700 | (build-counter.c): New target. Generate this file using | 700 | (build-counter.c): New target. Generate this file using |
| 701 | makecounter.sh upon changes to lisp.mk or shortlisp. | 701 | makecounter.sh upon changes to lisp.mk or shortlisp. |
| 702 | (lisp.mk): Make and load relative to abs_top_builddir. | 702 | (lisp.mk): Make and load relative to abs_top_builddir. |
| 703 | (emacs$(EXEEXT)): Adjust acordingly. | 703 | (emacs$(EXEEXT)): Adjust accordingly. |
| 704 | (mostlyclean): Remove build-counter.c. | 704 | (mostlyclean): Remove build-counter.c. |
| 705 | 705 | ||
| 706 | 2023-07-18 Po Lu <luangruo@yahoo.com> | 706 | 2023-07-18 Po Lu <luangruo@yahoo.com> |
| @@ -735,7 +735,7 @@ | |||
| 735 | prototypes. | 735 | prototypes. |
| 736 | 736 | ||
| 737 | * java/org/gnu/emacs/EmacsWindow.java (motionEvent): Set | 737 | * java/org/gnu/emacs/EmacsWindow.java (motionEvent): Set |
| 738 | cancelation flag in events sent where appropriate. | 738 | cancellation flag in events sent where appropriate. |
| 739 | 739 | ||
| 740 | * lisp/touch-screen.el (touch-screen-handle-point-update): | 740 | * lisp/touch-screen.el (touch-screen-handle-point-update): |
| 741 | Improve treatment of horizontal scrolling near window edges. | 741 | Improve treatment of horizontal scrolling near window edges. |
| @@ -749,7 +749,7 @@ | |||
| 749 | (struct android_touch_event): New field `flags'. | 749 | (struct android_touch_event): New field `flags'. |
| 750 | 750 | ||
| 751 | * src/androidterm.c (handle_one_android_event): Report | 751 | * src/androidterm.c (handle_one_android_event): Report |
| 752 | cancelation in TOUCHSCREEN_END_EVENTs. | 752 | cancellation in TOUCHSCREEN_END_EVENTs. |
| 753 | 753 | ||
| 754 | * src/keyboard.c (make_lispy_event): Fix botched merge. | 754 | * src/keyboard.c (make_lispy_event): Fix botched merge. |
| 755 | 755 | ||
| @@ -1005,7 +1005,7 @@ | |||
| 1005 | 1005 | ||
| 1006 | * java/org/gnu/emacs/EmacsWindow.java (Coordinate): New fields | 1006 | * java/org/gnu/emacs/EmacsWindow.java (Coordinate): New fields |
| 1007 | `button' and `id'. | 1007 | `button' and `id'. |
| 1008 | (<init>): Add new arguments to the construtor. | 1008 | (<init>): Add new arguments to the constructor. |
| 1009 | (whatButtonWasIt): Return 0 if the button state has not changed. | 1009 | (whatButtonWasIt): Return 0 if the button state has not changed. |
| 1010 | (buttonForEvent): New function. | 1010 | (buttonForEvent): New function. |
| 1011 | (figureChange): Return the Coordinate object associated to EVENT. | 1011 | (figureChange): Return the Coordinate object associated to EVENT. |
| @@ -2384,7 +2384,7 @@ | |||
| 2384 | (sfnt_read_avar_table): Fix sequencing problem. | 2384 | (sfnt_read_avar_table): Fix sequencing problem. |
| 2385 | 2385 | ||
| 2386 | * src/sfntfont.c (sfntfont_setup_interpreter): Don't create | 2386 | * src/sfntfont.c (sfntfont_setup_interpreter): Don't create |
| 2387 | interpreter for blatently broken fonts. | 2387 | interpreter for blatantly broken fonts. |
| 2388 | (sfntfont_open): Avoid specifying redundant blends. | 2388 | (sfntfont_open): Avoid specifying redundant blends. |
| 2389 | 2389 | ||
| 2390 | * src/sfnt.c (sfnt_validate_gs): Fix validation of projection | 2390 | * src/sfnt.c (sfnt_validate_gs): Fix validation of projection |
| @@ -3466,7 +3466,7 @@ | |||
| 3466 | (src/verbose.mk): Depend on verbose.mk.android in srcdir. | 3466 | (src/verbose.mk): Depend on verbose.mk.android in srcdir. |
| 3467 | (lib/Makefile): Edit srcdir and VPATH to LIB_SRCDIR. | 3467 | (lib/Makefile): Edit srcdir and VPATH to LIB_SRCDIR. |
| 3468 | (src/Makefile): Edit -I$$(top_srcdir) to -I../$(srcdir)/lib, | 3468 | (src/Makefile): Edit -I$$(top_srcdir) to -I../$(srcdir)/lib, |
| 3469 | instead of ommitting it. | 3469 | instead of omitting it. |
| 3470 | (clean): Allow ndk-build clean to fail. | 3470 | (clean): Allow ndk-build clean to fail. |
| 3471 | 3471 | ||
| 3472 | * java/Makefile.in (builddir): New variable. | 3472 | * java/Makefile.in (builddir): New variable. |
| @@ -3714,7 +3714,7 @@ | |||
| 3714 | module detection. | 3714 | module detection. |
| 3715 | 3715 | ||
| 3716 | * src/android.c (android_run_select_thread): Fix typos. | 3716 | * src/android.c (android_run_select_thread): Fix typos. |
| 3717 | (android_run_select_thread): Lock select_mutex before signalling | 3717 | (android_run_select_thread): Lock select_mutex before signaling |
| 3718 | condition variable. | 3718 | condition variable. |
| 3719 | (android_select): Unlock event queue mutex prior to waiting for | 3719 | (android_select): Unlock event queue mutex prior to waiting for |
| 3720 | it. | 3720 | it. |
| @@ -4663,7 +4663,7 @@ | |||
| 4663 | (ndk_CONFIG_FILES): Export NDK_BUILD_CFLAGS. | 4663 | (ndk_CONFIG_FILES): Export NDK_BUILD_CFLAGS. |
| 4664 | 4664 | ||
| 4665 | * java/AndroidManifest.xml.in: Prevent the Emacs activity from | 4665 | * java/AndroidManifest.xml.in: Prevent the Emacs activity from |
| 4666 | being overlayed by the emacsclient wrapper. | 4666 | being overlaid by the emacsclient wrapper. |
| 4667 | * java/org/gnu/emacs/EmacsOpenActivity.java (run): Likewise. | 4667 | * java/org/gnu/emacs/EmacsOpenActivity.java (run): Likewise. |
| 4668 | (onCreate): Set an appropriate theme on ICS and up. | 4668 | (onCreate): Set an appropriate theme on ICS and up. |
| 4669 | 4669 | ||
| @@ -5151,7 +5151,7 @@ | |||
| 5151 | * m4/ndk-build.m4 (ndk_package_mape): Add package mapping for | 5151 | * m4/ndk-build.m4 (ndk_package_mape): Add package mapping for |
| 5152 | sqlite3. | 5152 | sqlite3. |
| 5153 | 5153 | ||
| 5154 | * src/Makefile.in (SQLITE3_CFLAGS): New substition. | 5154 | * src/Makefile.in (SQLITE3_CFLAGS): New substitution. |
| 5155 | (EMACS_CFLAGS): Add that variable. | 5155 | (EMACS_CFLAGS): Add that variable. |
| 5156 | 5156 | ||
| 5157 | * src/android.c (android_api_level): New variable. | 5157 | * src/android.c (android_api_level): New variable. |
| @@ -5532,7 +5532,7 @@ | |||
| 5532 | (touch-screen-precision-scroll): New user option. | 5532 | (touch-screen-precision-scroll): New user option. |
| 5533 | (touch-screen-handle-scroll): Use traditional scrolling by | 5533 | (touch-screen-handle-scroll): Use traditional scrolling by |
| 5534 | default. | 5534 | default. |
| 5535 | (touch-screen-handle-touch): Adust format of | 5535 | (touch-screen-handle-touch): Adjust format of |
| 5536 | touch-screen-current-tool. | 5536 | touch-screen-current-tool. |
| 5537 | (touch-screen-track-tap): Don't print waiting for events. | 5537 | (touch-screen-track-tap): Don't print waiting for events. |
| 5538 | (touch-screen-track-drag): Likewise. Also, don't call UPDATE | 5538 | (touch-screen-track-drag): Likewise. Also, don't call UPDATE |
| @@ -5555,7 +5555,7 @@ | |||
| 5555 | * lisp/ls-lisp.el (ls-lisp-use-insert-directory-program): Default | 5555 | * lisp/ls-lisp.el (ls-lisp-use-insert-directory-program): Default |
| 5556 | to off on Android. | 5556 | to off on Android. |
| 5557 | 5557 | ||
| 5558 | * src/android.c (android_is_directory): New fucntion. | 5558 | * src/android.c (android_is_directory): New function. |
| 5559 | (android_fstatat): Handle directories created by | 5559 | (android_fstatat): Handle directories created by |
| 5560 | `android_opendir'. | 5560 | `android_opendir'. |
| 5561 | (android_open): Return meaningful file mode. | 5561 | (android_open): Return meaningful file mode. |
| @@ -5645,7 +5645,7 @@ | |||
| 5645 | * java/org/gnu/emacs/EmacsNative.java (EmacsNative): Make all | 5645 | * java/org/gnu/emacs/EmacsNative.java (EmacsNative): Make all |
| 5646 | event sending functions return long. | 5646 | event sending functions return long. |
| 5647 | 5647 | ||
| 5648 | * java/org/gnu/emacs/EmacsPreferencesActivity.java: New fle. | 5648 | * java/org/gnu/emacs/EmacsPreferencesActivity.java: New file. |
| 5649 | 5649 | ||
| 5650 | * java/org/gnu/emacs/EmacsService.java (EmacsService) | 5650 | * java/org/gnu/emacs/EmacsService.java (EmacsService) |
| 5651 | (onStartCommand, onCreate, startEmacsService): Start as a | 5651 | (onStartCommand, onCreate, startEmacsService): Start as a |
| @@ -6310,7 +6310,7 @@ | |||
| 6310 | and `detectMouse'. | 6310 | and `detectMouse'. |
| 6311 | (struct android_event_queue, android_init_events) | 6311 | (struct android_event_queue, android_init_events) |
| 6312 | (android_next_event, android_write_event): Remove write limit. | 6312 | (android_next_event, android_write_event): Remove write limit. |
| 6313 | (android_file_access_p): Handle directories correcty. | 6313 | (android_file_access_p): Handle directories correctly. |
| 6314 | (android_close): Fix coding style. | 6314 | (android_close): Fix coding style. |
| 6315 | (android_fclose): New function. | 6315 | (android_fclose): New function. |
| 6316 | (android_init_emacs_service): Initialize new methods. | 6316 | (android_init_emacs_service): Initialize new methods. |
diff --git a/admin/notes/java b/admin/notes/java index 125ac0aad67..6a66d1aa765 100644 --- a/admin/notes/java +++ b/admin/notes/java | |||
| @@ -15,7 +15,7 @@ Java is required because the entire Android runtime is based around | |||
| 15 | Java, and there is no way to write an Android program which runs | 15 | Java, and there is no way to write an Android program which runs |
| 16 | without Java. | 16 | without Java. |
| 17 | 17 | ||
| 18 | This text exists to prime other Emacs developers, already familar with | 18 | This text exists to prime other Emacs developers, already familiar with |
| 19 | C, on the basic architecture of the Android port, and to teach them | 19 | C, on the basic architecture of the Android port, and to teach them |
| 20 | how to read and write the Java code found in this directory. | 20 | how to read and write the Java code found in this directory. |
| 21 | 21 | ||
| @@ -570,7 +570,7 @@ Let us go back and review the definition of ``startEmacsService'': | |||
| 570 | context.startService (new Intent (context, | 570 | context.startService (new Intent (context, |
| 571 | EmacsService.class)); | 571 | EmacsService.class)); |
| 572 | else | 572 | else |
| 573 | /* Display the permanant notification and start Emacs as a | 573 | /* Display the permanent notification and start Emacs as a |
| 574 | foreground service. */ | 574 | foreground service. */ |
| 575 | context.startForegroundService (new Intent (context, | 575 | context.startForegroundService (new Intent (context, |
| 576 | EmacsService.class)); | 576 | EmacsService.class)); |
| @@ -796,7 +796,7 @@ Next, `max_handle' is saved, and a new handle is allocated for | |||
| 796 | if (!window) | 796 | if (!window) |
| 797 | error ("Out of window handles!"); | 797 | error ("Out of window handles!"); |
| 798 | 798 | ||
| 799 | An error is signalled if Emacs runs out of available handles. | 799 | An error is signaled if Emacs runs out of available handles. |
| 800 | 800 | ||
| 801 | if (!class) | 801 | if (!class) |
| 802 | { | 802 | { |
diff --git a/configure.ac b/configure.ac index 759dcd14d50..a279f78a0ea 100644 --- a/configure.ac +++ b/configure.ac | |||
| @@ -306,7 +306,7 @@ AC_DEFUN([OPTION_DEFAULT_OFF], [dnl | |||
| 306 | 306 | ||
| 307 | dnl OPTION_DEFAULT_IFAVAILABLE(NAME, HELP-STRING) | 307 | dnl OPTION_DEFAULT_IFAVAILABLE(NAME, HELP-STRING) |
| 308 | dnl Create a new --with option that defaults to 'ifavailable', | 308 | dnl Create a new --with option that defaults to 'ifavailable', |
| 309 | dnl unless it is overriden by $with_features being equal to 'no'. | 309 | dnl unless it is overridden by $with_features being equal to 'no'. |
| 310 | dnl NAME is the base name of the option. The shell variable with_NAME | 310 | dnl NAME is the base name of the option. The shell variable with_NAME |
| 311 | dnl will be set to either the user's value (if the option is | 311 | dnl will be set to either the user's value (if the option is |
| 312 | dnl specified; 'yes' for a plain --with-NAME) or to 'ifavailable' (if the | 312 | dnl specified; 'yes' for a plain --with-NAME) or to 'ifavailable' (if the |
diff --git a/cross/ndk-build/README b/cross/ndk-build/README index aca2e7230bf..d6cf2908014 100644 --- a/cross/ndk-build/README +++ b/cross/ndk-build/README | |||
| @@ -86,7 +86,7 @@ $(ANDROID_MAKEFILE), the ``Android.mk'' file, for the first time. The | |||
| 86 | purpose of this evaluation is to establish a list of packages (or | 86 | purpose of this evaluation is to establish a list of packages (or |
| 87 | modules) provided by the ``Android.mk'' file, and the corresponding | 87 | modules) provided by the ``Android.mk'' file, and the corresponding |
| 88 | Makefile targets and compiler and linker flags required to build and | 88 | Makefile targets and compiler and linker flags required to build and |
| 89 | link to those tagets. | 89 | link to those targets. |
| 90 | 90 | ||
| 91 | Before doing so, build-aux/ndk-build-helper.mk will define several | 91 | Before doing so, build-aux/ndk-build-helper.mk will define several |
| 92 | variables and functions required by all ``Android.mk'' files. The | 92 | variables and functions required by all ``Android.mk'' files. The |
| @@ -164,7 +164,7 @@ module_cxx_deps="" | |||
| 164 | module_imports="" | 164 | module_imports="" |
| 165 | 165 | ||
| 166 | which is then evaluated by `configure'. Once the variable | 166 | which is then evaluated by `configure'. Once the variable |
| 167 | `module_name' is set, configure apends the remaining | 167 | `module_name' is set, configure appends the remaining |
| 168 | $(module_includes), $(module_cflags) and $(module_ldflags) to the | 168 | $(module_includes), $(module_cflags) and $(module_ldflags) to the |
| 169 | module's CFLAGS and LIBS variables, and appends the list of Makefile | 169 | module's CFLAGS and LIBS variables, and appends the list of Makefile |
| 170 | targets specified to the variable NDK_BUILD_MODULES. | 170 | targets specified to the variable NDK_BUILD_MODULES. |
diff --git a/doc/emacs/android.texi b/doc/emacs/android.texi index 52912d045eb..fe73bc09d67 100644 --- a/doc/emacs/android.texi +++ b/doc/emacs/android.texi | |||
| @@ -234,7 +234,7 @@ Document Providers}.) | |||
| 234 | the (normally read-only) root directory named @file{content} or | 234 | the (normally read-only) root directory named @file{content} or |
| 235 | @file{assets}, you may want to access real files by these names if the | 235 | @file{assets}, you may want to access real files by these names if the |
| 236 | Android installation in use has been customized. These files will | 236 | Android installation in use has been customized. These files will |
| 237 | conflict with the aformentioned special directories, but can | 237 | conflict with the aforementioned special directories, but can |
| 238 | nevertheless be accessed by writing their names relative to the | 238 | nevertheless be accessed by writing their names relative to the |
| 239 | ``parent'' directory of the root directory, as so illustrated: | 239 | ``parent'' directory of the root directory, as so illustrated: |
| 240 | @file{/../content}, @file{/../assets}. | 240 | @file{/../content}, @file{/../assets}. |
| @@ -258,7 +258,7 @@ at startup to symlink the application library directory to its | |||
| 258 | traditional location within the parent of the app data directory. | 258 | traditional location within the parent of the app data directory. |
| 259 | 259 | ||
| 260 | If Emacs is reinstalled and the location of the app library | 260 | If Emacs is reinstalled and the location of the app library |
| 261 | directory consequentially changes, that symlink will also be updated | 261 | directory consequently changes, that symlink will also be updated |
| 262 | to point to its new location the next time Emacs is started by the | 262 | to point to its new location the next time Emacs is started by the |
| 263 | system. | 263 | system. |
| 264 | 264 | ||
| @@ -340,7 +340,7 @@ to its app data directory (@pxref{Android File | |||
| 340 | System}.)@footnote{Except in cases where a ``shared user ID'' is | 340 | System}.)@footnote{Except in cases where a ``shared user ID'' is |
| 341 | specified and other applications signed using the same ``package | 341 | specified and other applications signed using the same ``package |
| 342 | signing key'' are installed, in which case Emacs runs as the same user | 342 | signing key'' are installed, in which case Emacs runs as the same user |
| 343 | and has access to the same files as each of the aformentioned | 343 | and has access to the same files as each of the aforementioned |
| 344 | applications.} | 344 | applications.} |
| 345 | 345 | ||
| 346 | Each application is also prohibited from accessing many system | 346 | Each application is also prohibited from accessing many system |
diff --git a/doc/emacs/haiku.texi b/doc/emacs/haiku.texi index 0bb216c14ae..e129fd6f33f 100644 --- a/doc/emacs/haiku.texi +++ b/doc/emacs/haiku.texi | |||
| @@ -10,7 +10,7 @@ re-implementation of the operating system BeOS. | |||
| 10 | 10 | ||
| 11 | This appendix describes the peculiarities of using Emacs built with | 11 | This appendix describes the peculiarities of using Emacs built with |
| 12 | the Application Kit, the windowing system indigenous to Haiku. The | 12 | the Application Kit, the windowing system indigenous to Haiku. The |
| 13 | idiosyncracies illustrated here do not apply to Emacs on Haiku built | 13 | idiosyncrasies illustrated here do not apply to Emacs on Haiku built |
| 14 | without windowing support, or configured with X11. | 14 | without windowing support, or configured with X11. |
| 15 | 15 | ||
| 16 | @menu | 16 | @menu |
diff --git a/doc/lispref/commands.texi b/doc/lispref/commands.texi index f6462a9e50b..b4226a9ec6f 100644 --- a/doc/lispref/commands.texi +++ b/doc/lispref/commands.texi | |||
| @@ -2151,7 +2151,7 @@ is dismissed (@pxref{Mouse Menus}), Emacs also avoids simple | |||
| 2151 | translation if @code{down-mouse-1} is bound to a keymap, making it a | 2151 | translation if @code{down-mouse-1} is bound to a keymap, making it a |
| 2152 | prefix key. In lieu of simple translation, it translates the closing | 2152 | prefix key. In lieu of simple translation, it translates the closing |
| 2153 | @code{touchscreen-end} to a @code{down-mouse-1} event with the | 2153 | @code{touchscreen-end} to a @code{down-mouse-1} event with the |
| 2154 | starting position of the touch sequence, consequentially displaying | 2154 | starting position of the touch sequence, consequently displaying |
| 2155 | the mouse menu. | 2155 | the mouse menu. |
| 2156 | 2156 | ||
| 2157 | @cindex @code{mouse-1-menu-command}, a symbol property | 2157 | @cindex @code{mouse-1-menu-command}, a symbol property |
| @@ -2205,7 +2205,7 @@ position of the touchpoint. | |||
| 2205 | @item (touchscreen-restart-drag @var{posn}) | 2205 | @item (touchscreen-restart-drag @var{posn}) |
| 2206 | This event is sent upon the start of a touch sequence resulting in the | 2206 | This event is sent upon the start of a touch sequence resulting in the |
| 2207 | continuation of a ``drag-to-select'' gesture (subject to the | 2207 | continuation of a ``drag-to-select'' gesture (subject to the |
| 2208 | aformentioned user option) with @var{posn} set to the position list of | 2208 | aforementioned user option) with @var{posn} set to the position list of |
| 2209 | the initial @code{touchscreen-begin} event within that touch sequence. | 2209 | the initial @code{touchscreen-begin} event within that touch sequence. |
| 2210 | 2210 | ||
| 2211 | @cindex @code{touchscreen-pinch} event | 2211 | @cindex @code{touchscreen-pinch} event |
diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi index ec6f7fd9462..f09ee0afbf4 100644 --- a/doc/lispref/frames.texi +++ b/doc/lispref/frames.texi | |||
| @@ -4160,7 +4160,7 @@ code, for it's only meant to abet synchronization between the X | |||
| 4160 | server, owner and requestor. | 4160 | server, owner and requestor. |
| 4161 | @end itemize | 4161 | @end itemize |
| 4162 | 4162 | ||
| 4163 | The selection owner responds by tranferring to the requestor a | 4163 | The selection owner responds by transferring to the requestor a |
| 4164 | series of bytes, 16 bit words, or 32 bit words, along with another | 4164 | series of bytes, 16 bit words, or 32 bit words, along with another |
| 4165 | atom identifying the type of those words. After requesting a | 4165 | atom identifying the type of those words. After requesting a |
| 4166 | selection, Emacs then applies its own interpretation of the data | 4166 | selection, Emacs then applies its own interpretation of the data |
diff --git a/doc/lispref/minibuf.texi b/doc/lispref/minibuf.texi index ba7f1ca692e..03c221c6cf6 100644 --- a/doc/lispref/minibuf.texi +++ b/doc/lispref/minibuf.texi | |||
| @@ -1564,7 +1564,7 @@ Interactively, or when @var{display} is non-@code{nil}, the return | |||
| 1564 | value is also displayed in the echo area. | 1564 | value is also displayed in the echo area. |
| 1565 | 1565 | ||
| 1566 | The optional arguments @var{foreground} and @var{face} control the | 1566 | The optional arguments @var{foreground} and @var{face} control the |
| 1567 | appearence of the completion candidates in the @file{*Completions*} | 1567 | appearance of the completion candidates in the @file{*Completions*} |
| 1568 | buffer. The candidates are displayed in the specified @var{face} but | 1568 | buffer. The candidates are displayed in the specified @var{face} but |
| 1569 | with different colors: if @var{foreground} is non-@code{nil}, the | 1569 | with different colors: if @var{foreground} is non-@code{nil}, the |
| 1570 | foreground color is changed to be the color of the candidate, | 1570 | foreground color is changed to be the color of the candidate, |
diff --git a/doc/lispref/searching.texi b/doc/lispref/searching.texi index cb269fcacc5..1a898828eb1 100644 --- a/doc/lispref/searching.texi +++ b/doc/lispref/searching.texi | |||
| @@ -2990,7 +2990,7 @@ values of the variables @code{sentence-end-double-space} | |||
| 2990 | @section Emacs versus POSIX Regular Expressions | 2990 | @section Emacs versus POSIX Regular Expressions |
| 2991 | @cindex POSIX regular expressions | 2991 | @cindex POSIX regular expressions |
| 2992 | 2992 | ||
| 2993 | Regular expression syntax varies signficantly among computer programs. | 2993 | Regular expression syntax varies significantly among computer programs. |
| 2994 | When writing Elisp code that generates regular expressions for use by other | 2994 | When writing Elisp code that generates regular expressions for use by other |
| 2995 | programs, it is helpful to know how syntax variants differ. | 2995 | programs, it is helpful to know how syntax variants differ. |
| 2996 | To give a feel for the variation, this section discusses how | 2996 | To give a feel for the variation, this section discusses how |
diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi index 5d05ef18d4f..b17eb087f42 100644 --- a/doc/lispref/text.texi +++ b/doc/lispref/text.texi | |||
| @@ -6205,7 +6205,7 @@ cons it was set to at the time @code{prepare-change-group} was called. | |||
| 6205 | 6205 | ||
| 6206 | If @code{buffer-undo-list} no longer contains that cons, Emacs will | 6206 | If @code{buffer-undo-list} no longer contains that cons, Emacs will |
| 6207 | lose track of any change groups, resulting in an error when the change | 6207 | lose track of any change groups, resulting in an error when the change |
| 6208 | group is cancelled. To avoid this, do not call any functions which | 6208 | group is canceled. To avoid this, do not call any functions which |
| 6209 | may edit the undo list in such a manner, when a change group is | 6209 | may edit the undo list in such a manner, when a change group is |
| 6210 | active: notably, ``amalgamating'' commands such as @code{delete-char}, | 6210 | active: notably, ``amalgamating'' commands such as @code{delete-char}, |
| 6211 | which call @code{undo-auto-amalgamate}. | 6211 | which call @code{undo-auto-amalgamate}. |
diff --git a/doc/misc/ert.texi b/doc/misc/ert.texi index 892ff4dd5e4..a0adb5fea2c 100644 --- a/doc/misc/ert.texi +++ b/doc/misc/ert.texi | |||
| @@ -954,7 +954,7 @@ comments directly and can be read either from inline strings or files. | |||
| 954 | 954 | ||
| 955 | Test assertion parser extracts tests from comment-only lines. Every | 955 | Test assertion parser extracts tests from comment-only lines. Every |
| 956 | comment assertion line starts either with a caret (@samp{^}) or an | 956 | comment assertion line starts either with a caret (@samp{^}) or an |
| 957 | arrow (@samp{<-}). A caret/arrow should be followed immedately by the | 957 | arrow (@samp{<-}). A caret/arrow should be followed immediately by the |
| 958 | name of a face to be checked. | 958 | name of a face to be checked. |
| 959 | 959 | ||
| 960 | The test then checks if the first non-assertion column above the caret | 960 | The test then checks if the first non-assertion column above the caret |
diff --git a/doc/misc/modus-themes.org b/doc/misc/modus-themes.org index 7eedc97ab04..bdcb0793098 100644 --- a/doc/misc/modus-themes.org +++ b/doc/misc/modus-themes.org | |||
| @@ -90,7 +90,7 @@ The Modus themes consist of eight themes, divided into four subgroups. | |||
| 90 | are variants of the two main themes. They slightly tone down the | 90 | are variants of the two main themes. They slightly tone down the |
| 91 | intensity of the background and provide a bit more color variety. | 91 | intensity of the background and provide a bit more color variety. |
| 92 | ~modus-operandi-tinted~ has a set of base tones that are shades of | 92 | ~modus-operandi-tinted~ has a set of base tones that are shades of |
| 93 | light ochre (earthly colors), while ~modus-vivendi-tinted~ gives a | 93 | light ocher (earthly colors), while ~modus-vivendi-tinted~ gives a |
| 94 | night sky impression. | 94 | night sky impression. |
| 95 | 95 | ||
| 96 | - Deuteranopia themes :: ~modus-operandi-deuteranopia~ and its | 96 | - Deuteranopia themes :: ~modus-operandi-deuteranopia~ and its |
| @@ -2518,7 +2518,7 @@ manual, here is what Protesilaos uses: | |||
| 2518 | ;; Add a nuanced background as well. | 2518 | ;; Add a nuanced background as well. |
| 2519 | (bg-prompt bg-magenta-nuanced) | 2519 | (bg-prompt bg-magenta-nuanced) |
| 2520 | (fg-prompt magenta-cooler) | 2520 | (fg-prompt magenta-cooler) |
| 2521 | ;; Tweak some more constructs for stylistic constistency. | 2521 | ;; Tweak some more constructs for stylistic consistency. |
| 2522 | (name blue-warmer) | 2522 | (name blue-warmer) |
| 2523 | (identifier magenta-faint) | 2523 | (identifier magenta-faint) |
| 2524 | (keybind magenta-cooler) | 2524 | (keybind magenta-cooler) |
| @@ -2717,7 +2717,7 @@ For a more elaborate design, it is better to inspect the source code of | |||
| 2717 | [[#h:51ba3547-b8c8-40d6-ba5a-4586477fd4ae][Use theme colors in code with modus-themes-with-colors]]. | 2717 | [[#h:51ba3547-b8c8-40d6-ba5a-4586477fd4ae][Use theme colors in code with modus-themes-with-colors]]. |
| 2718 | 2718 | ||
| 2719 | #+findex: modus-themes-get-color-value | 2719 | #+findex: modus-themes-get-color-value |
| 2720 | The fuction ~modus-themes-get-color-value~ can be called from Lisp to | 2720 | The function ~modus-themes-get-color-value~ can be called from Lisp to |
| 2721 | return the value of a color from the active Modus theme palette. It | 2721 | return the value of a color from the active Modus theme palette. It |
| 2722 | takea a =COLOR= argument and an optional =OVERRIDES=. | 2722 | takea a =COLOR= argument and an optional =OVERRIDES=. |
| 2723 | 2723 | ||
| @@ -2886,7 +2886,7 @@ above: | |||
| 2886 | The reason we no longer provide this option is because it depends on a | 2886 | The reason we no longer provide this option is because it depends on a |
| 2887 | non-~nil~ value for ~x-underline-at-descent-line~. That variable | 2887 | non-~nil~ value for ~x-underline-at-descent-line~. That variable |
| 2888 | affects ALL underlines, including those of links. The effect is | 2888 | affects ALL underlines, including those of links. The effect is |
| 2889 | intrusive and looks awkard in prose. | 2889 | intrusive and looks awkward in prose. |
| 2890 | 2890 | ||
| 2891 | As such, the Modus themes no longer provide that option but instead | 2891 | As such, the Modus themes no longer provide that option but instead |
| 2892 | offer this piece of documentation to make the user fully aware of the | 2892 | offer this piece of documentation to make the user fully aware of the |
| @@ -3229,7 +3229,7 @@ specification of that variable looks like this: | |||
| 3229 | 3229 | ||
| 3230 | With the exception of ~org-verbatim~ and ~org-code~ faces, everything else | 3230 | With the exception of ~org-verbatim~ and ~org-code~ faces, everything else |
| 3231 | uses the corresponding type of emphasis: a bold typographic weight, or | 3231 | uses the corresponding type of emphasis: a bold typographic weight, or |
| 3232 | italicised, underlined, and struck through text. | 3232 | italicized, underlined, and struck through text. |
| 3233 | 3233 | ||
| 3234 | The best way for users to add some extra attributes, such as a | 3234 | The best way for users to add some extra attributes, such as a |
| 3235 | foreground color, is to define their own faces and assign them to the | 3235 | foreground color, is to define their own faces and assign them to the |
| @@ -5132,7 +5132,7 @@ it is already understood that one must follow the indicator or headline | |||
| 5132 | to view its contents and (ii) underlining everything would make the | 5132 | to view its contents and (ii) underlining everything would make the |
| 5133 | interface virtually unusable. | 5133 | interface virtually unusable. |
| 5134 | 5134 | ||
| 5135 | Again, one must exercise judgement in order to avoid discrimination, | 5135 | Again, one must exercise judgment in order to avoid discrimination, |
| 5136 | where "discrimination" refers to: | 5136 | where "discrimination" refers to: |
| 5137 | 5137 | ||
| 5138 | + The treatment of substantially different magnitudes as if they were of | 5138 | + The treatment of substantially different magnitudes as if they were of |
| @@ -5206,7 +5206,7 @@ the themes, which is partially fleshed out in this manual. | |||
| 5206 | 5206 | ||
| 5207 | With regard to the artistic aspect (where "art" qua skill may amount to | 5207 | With regard to the artistic aspect (where "art" qua skill may amount to |
| 5208 | an imprecise science), there is no hard-and-fast rule in effect as it | 5208 | an imprecise science), there is no hard-and-fast rule in effect as it |
| 5209 | requires one to exercize discretion and make decisions based on | 5209 | requires one to exercise discretion and make decisions based on |
| 5210 | context-dependent information or constraints. As is true with most | 5210 | context-dependent information or constraints. As is true with most |
| 5211 | things in life, when in doubt, do not cling on to the letter of the law | 5211 | things in life, when in doubt, do not cling on to the letter of the law |
| 5212 | but try to understand its spirit. | 5212 | but try to understand its spirit. |
| @@ -1142,7 +1142,7 @@ one to upload, like so: | |||
| 1142 | ../java/debug.sh --gdbserver /path/to/gdbserver | 1142 | ../java/debug.sh --gdbserver /path/to/gdbserver |
| 1143 | 1143 | ||
| 1144 | This Gdbserver should be statically linked or compiled using the | 1144 | This Gdbserver should be statically linked or compiled using the |
| 1145 | Android NDK, and must target the same architecture as the debugee | 1145 | Android NDK, and must target the same architecture as the debugged |
| 1146 | Emacs binary. Older versions of the Android NDK (such as r24) | 1146 | Emacs binary. Older versions of the Android NDK (such as r24) |
| 1147 | distribute suitable Gdbserver binaries, usually located within | 1147 | distribute suitable Gdbserver binaries, usually located within |
| 1148 | 1148 | ||
| @@ -1224,7 +1224,7 @@ This user option has been obsoleted in Emacs 27, use | |||
| 1224 | --- | 1224 | --- |
| 1225 | ** User options 'eshell-NAME-unload-hook' are now obsolete. | 1225 | ** User options 'eshell-NAME-unload-hook' are now obsolete. |
| 1226 | These hooks were named incorrectly, and so they never actually ran | 1226 | These hooks were named incorrectly, and so they never actually ran |
| 1227 | when unloading the correspending feature. Instead, you should use | 1227 | when unloading the corresponding feature. Instead, you should use |
| 1228 | hooks named after the feature name, like 'esh-mode-unload-hook'. | 1228 | hooks named after the feature name, like 'esh-mode-unload-hook'. |
| 1229 | 1229 | ||
| 1230 | +++ | 1230 | +++ |
diff --git a/etc/PROBLEMS b/etc/PROBLEMS index 7159fe32c1c..e42e3c4d87a 100644 --- a/etc/PROBLEMS +++ b/etc/PROBLEMS | |||
| @@ -3539,7 +3539,7 @@ The Microsoft scaler and FreeType promptly disregard such points. | |||
| 3539 | 3539 | ||
| 3540 | Nothing in the TrueType specifications implies that points "hidden" in | 3540 | Nothing in the TrueType specifications implies that points "hidden" in |
| 3541 | this fashion should be afforded any special treatment, and thus Emacs | 3541 | this fashion should be afforded any special treatment, and thus Emacs |
| 3542 | eschews doing so. Consequentially, black streaks are displayed as | 3542 | eschews doing so. Consequently, black streaks are displayed as |
| 3543 | Emacs interpolates glyph edges between points within the glyph and | 3543 | Emacs interpolates glyph edges between points within the glyph and |
| 3544 | points the test font attempts to hide. | 3544 | points the test font attempts to hide. |
| 3545 | 3545 | ||
diff --git a/etc/themes/modus-operandi-tinted-theme.el b/etc/themes/modus-operandi-tinted-theme.el index e66a030650c..1ef7af8f165 100644 --- a/etc/themes/modus-operandi-tinted-theme.el +++ b/etc/themes/modus-operandi-tinted-theme.el | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | ;;; modus-operandi-tinted-theme.el --- Elegant, highly legible theme with a light ochre background -*- lexical-binding:t -*- | 1 | ;;; modus-operandi-tinted-theme.el --- Elegant, highly legible theme with a light ocher background -*- lexical-binding:t -*- |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2019-2023 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2019-2023 Free Software Foundation, Inc. |
| 4 | 4 | ||
| @@ -44,7 +44,7 @@ | |||
| 44 | 44 | ||
| 45 | ;;;###theme-autoload | 45 | ;;;###theme-autoload |
| 46 | (deftheme modus-operandi-tinted | 46 | (deftheme modus-operandi-tinted |
| 47 | "Elegant, highly legible theme with a light ochre background. | 47 | "Elegant, highly legible theme with a light ocher background. |
| 48 | Conforms with the highest legibility standard for color contrast | 48 | Conforms with the highest legibility standard for color contrast |
| 49 | between background and foreground in any given piece of text, | 49 | between background and foreground in any given piece of text, |
| 50 | which corresponds to a minimum contrast in relative luminance of | 50 | which corresponds to a minimum contrast in relative luminance of |
diff --git a/etc/themes/modus-themes.el b/etc/themes/modus-themes.el index 34130a05515..0f7bc025b72 100644 --- a/etc/themes/modus-themes.el +++ b/etc/themes/modus-themes.el | |||
| @@ -1535,7 +1535,7 @@ color that is combined with FG-FOR-BG." | |||
| 1535 | :foreground fg | 1535 | :foreground fg |
| 1536 | :weight | 1536 | :weight |
| 1537 | ;; If we have `bold' specifically, we inherit the face of | 1537 | ;; If we have `bold' specifically, we inherit the face of |
| 1538 | ;; the same name. This allows the user to customise that | 1538 | ;; the same name. This allows the user to customize that |
| 1539 | ;; face, such as to change its font family. | 1539 | ;; face, such as to change its font family. |
| 1540 | (if (and weight (not (eq weight 'bold))) | 1540 | (if (and weight (not (eq weight 'bold))) |
| 1541 | weight | 1541 | weight |
diff --git a/exec/exec1.c b/exec/exec1.c index d77ca8adf54..6ec4b3ecaae 100644 --- a/exec/exec1.c +++ b/exec/exec1.c | |||
| @@ -53,7 +53,7 @@ main (int argc, char **argv) | |||
| 53 | 53 | ||
| 54 | tracing_execve (argv[2], argv + 2, environ); | 54 | tracing_execve (argv[2], argv + 2, environ); |
| 55 | 55 | ||
| 56 | /* An error occured. Exit with failure. */ | 56 | /* An error occurred. Exit with failure. */ |
| 57 | exit (127); | 57 | exit (127); |
| 58 | } | 58 | } |
| 59 | else | 59 | else |
diff --git a/exec/trace.c b/exec/trace.c index f9deef8eb2d..ccf498f39fe 100644 --- a/exec/trace.c +++ b/exec/trace.c | |||
| @@ -1028,7 +1028,7 @@ process_system_call (struct exec_tracee *tracee) | |||
| 1028 | break; | 1028 | break; |
| 1029 | 1029 | ||
| 1030 | case 1: | 1030 | case 1: |
| 1031 | /* An error has occured; errno is set to the error. */ | 1031 | /* An error has occurred; errno is set to the error. */ |
| 1032 | goto report_syscall_error; | 1032 | goto report_syscall_error; |
| 1033 | } | 1033 | } |
| 1034 | 1034 | ||
diff --git a/java/INSTALL b/java/INSTALL index fb221c5e2b4..60171ada57c 100644 --- a/java/INSTALL +++ b/java/INSTALL | |||
| @@ -167,7 +167,7 @@ than a compressed package for a newer version of Android. | |||
| 167 | BUILDING C++ DEPENDENCIES | 167 | BUILDING C++ DEPENDENCIES |
| 168 | 168 | ||
| 169 | With a new version of the NDK, dependencies containing C++ code should | 169 | With a new version of the NDK, dependencies containing C++ code should |
| 170 | build without any futher configuration. However, older versions | 170 | build without any further configuration. However, older versions |
| 171 | require that you use the ``make_standalone_toolchain.py'' script in | 171 | require that you use the ``make_standalone_toolchain.py'' script in |
| 172 | the NDK distribution to create a ``standalone toolchain'', and use | 172 | the NDK distribution to create a ``standalone toolchain'', and use |
| 173 | that instead, in order for C++ headers to be found. | 173 | that instead, in order for C++ headers to be found. |
| @@ -309,7 +309,7 @@ work, along with what has to be patched to make them work: | |||
| 309 | Many of these dependencies have been migrated over to the | 309 | Many of these dependencies have been migrated over to the |
| 310 | ``Android.bp'' build system now used to build Android itself. | 310 | ``Android.bp'' build system now used to build Android itself. |
| 311 | However, the old ``Android.mk'' Makefiles are still present in older | 311 | However, the old ``Android.mk'' Makefiles are still present in older |
| 312 | branches, and can be easily adapte to newer versions. | 312 | branches, and can be easily adapted to newer versions. |
| 313 | 313 | ||
| 314 | In addition, some Emacs dependencies provide `ndk-build' support | 314 | In addition, some Emacs dependencies provide `ndk-build' support |
| 315 | themselves: | 315 | themselves: |
diff --git a/java/org/gnu/emacs/EmacsContextMenu.java b/java/org/gnu/emacs/EmacsContextMenu.java index c415ba59c79..2652f35b545 100644 --- a/java/org/gnu/emacs/EmacsContextMenu.java +++ b/java/org/gnu/emacs/EmacsContextMenu.java | |||
| @@ -36,7 +36,7 @@ import android.view.SubMenu; | |||
| 36 | import android.util.Log; | 36 | import android.util.Log; |
| 37 | 37 | ||
| 38 | /* Context menu implementation. This object is built from JNI and | 38 | /* Context menu implementation. This object is built from JNI and |
| 39 | describes a menu hiearchy. Then, `inflate' can turn it into an | 39 | describes a menu hierarchy. Then, `inflate' can turn it into an |
| 40 | Android menu, which can be turned into a popup (or other kind of) | 40 | Android menu, which can be turned into a popup (or other kind of) |
| 41 | menu. */ | 41 | menu. */ |
| 42 | 42 | ||
diff --git a/java/org/gnu/emacs/EmacsInputConnection.java b/java/org/gnu/emacs/EmacsInputConnection.java index 7f6331205cb..4b493dcc456 100644 --- a/java/org/gnu/emacs/EmacsInputConnection.java +++ b/java/org/gnu/emacs/EmacsInputConnection.java | |||
| @@ -60,7 +60,7 @@ public final class EmacsInputConnection implements InputConnection | |||
| 60 | 60 | ||
| 61 | This helps with on screen keyboard programs found in some vendor | 61 | This helps with on screen keyboard programs found in some vendor |
| 62 | versions of Android, which rely on immediate updates to the point | 62 | versions of Android, which rely on immediate updates to the point |
| 63 | position after text is commited in order to place the cursor | 63 | position after text is committed in order to place the cursor |
| 64 | within that text. */ | 64 | within that text. */ |
| 65 | 65 | ||
| 66 | private static boolean syncAfterCommit; | 66 | private static boolean syncAfterCommit; |
diff --git a/java/org/gnu/emacs/EmacsOpenActivity.java b/java/org/gnu/emacs/EmacsOpenActivity.java index 32a79d1a797..b4fd68146be 100644 --- a/java/org/gnu/emacs/EmacsOpenActivity.java +++ b/java/org/gnu/emacs/EmacsOpenActivity.java | |||
| @@ -636,7 +636,7 @@ public final class EmacsOpenActivity extends Activity | |||
| 636 | { | 636 | { |
| 637 | /* This means Emacs lacks the rights to open this | 637 | /* This means Emacs lacks the rights to open this |
| 638 | file. Display the error message and exit. */ | 638 | file. Display the error message and exit. */ |
| 639 | displayFailureDialog ("Error openining file", | 639 | displayFailureDialog ("Error opening file", |
| 640 | exception.toString ()); | 640 | exception.toString ()); |
| 641 | return; | 641 | return; |
| 642 | } | 642 | } |
diff --git a/java/org/gnu/emacs/EmacsSafThread.java b/java/org/gnu/emacs/EmacsSafThread.java index 7917e2d4880..8bb84126b07 100644 --- a/java/org/gnu/emacs/EmacsSafThread.java +++ b/java/org/gnu/emacs/EmacsSafThread.java | |||
| @@ -767,7 +767,7 @@ public final class EmacsSafThread extends HandlerThread | |||
| 767 | 767 | ||
| 768 | private abstract class SafIntFunction | 768 | private abstract class SafIntFunction |
| 769 | { | 769 | { |
| 770 | /* The ``throws Throwable'' here is a Java idiosyncracy that tells | 770 | /* The ``throws Throwable'' here is a Java idiosyncrasy that tells |
| 771 | the compiler to allow arbitrary error objects to be signaled | 771 | the compiler to allow arbitrary error objects to be signaled |
| 772 | from within this function. | 772 | from within this function. |
| 773 | 773 | ||
| @@ -782,7 +782,7 @@ public final class EmacsSafThread extends HandlerThread | |||
| 782 | 782 | ||
| 783 | private abstract class SafObjectFunction | 783 | private abstract class SafObjectFunction |
| 784 | { | 784 | { |
| 785 | /* The ``throws Throwable'' here is a Java idiosyncracy that tells | 785 | /* The ``throws Throwable'' here is a Java idiosyncrasy that tells |
| 786 | the compiler to allow arbitrary error objects to be signaled | 786 | the compiler to allow arbitrary error objects to be signaled |
| 787 | from within this function. | 787 | from within this function. |
| 788 | 788 | ||
| @@ -1216,7 +1216,7 @@ public final class EmacsSafThread extends HandlerThread | |||
| 1216 | }); | 1216 | }); |
| 1217 | } | 1217 | } |
| 1218 | 1218 | ||
| 1219 | /* The bulk of `statDocument'. SIGNAL should be a cancelation | 1219 | /* The bulk of `statDocument'. SIGNAL should be a cancellation |
| 1220 | signal. */ | 1220 | signal. */ |
| 1221 | 1221 | ||
| 1222 | private long[] | 1222 | private long[] |
diff --git a/java/org/gnu/emacs/EmacsService.java b/java/org/gnu/emacs/EmacsService.java index 33832505333..c71670b3e47 100644 --- a/java/org/gnu/emacs/EmacsService.java +++ b/java/org/gnu/emacs/EmacsService.java | |||
| @@ -612,7 +612,7 @@ public final class EmacsService extends Service | |||
| 612 | context.startService (new Intent (context, | 612 | context.startService (new Intent (context, |
| 613 | EmacsService.class)); | 613 | EmacsService.class)); |
| 614 | else | 614 | else |
| 615 | /* Display the permanant notification and start Emacs as a | 615 | /* Display the permanent notification and start Emacs as a |
| 616 | foreground service. */ | 616 | foreground service. */ |
| 617 | context.startForegroundService (new Intent (context, | 617 | context.startForegroundService (new Intent (context, |
| 618 | EmacsService.class)); | 618 | EmacsService.class)); |
| @@ -679,7 +679,7 @@ public final class EmacsService extends Service | |||
| 679 | /* Display a list of programs able to send this URL. */ | 679 | /* Display a list of programs able to send this URL. */ |
| 680 | intent = Intent.createChooser (intent, "Send"); | 680 | intent = Intent.createChooser (intent, "Send"); |
| 681 | 681 | ||
| 682 | /* Apparently flags need to be set after a choser is | 682 | /* Apparently flags need to be set after a chooser is |
| 683 | created. */ | 683 | created. */ |
| 684 | intent.addFlags (Intent.FLAG_ACTIVITY_NEW_TASK); | 684 | intent.addFlags (Intent.FLAG_ACTIVITY_NEW_TASK); |
| 685 | } | 685 | } |
| @@ -927,7 +927,7 @@ public final class EmacsService extends Service | |||
| 927 | 927 | ||
| 928 | if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) | 928 | if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) |
| 929 | /* Since the system predates drag and drop, return this resolver | 929 | /* Since the system predates drag and drop, return this resolver |
| 930 | to avoid any unforseen difficulties. */ | 930 | to avoid any unforeseen difficulties. */ |
| 931 | return resolver; | 931 | return resolver; |
| 932 | 932 | ||
| 933 | activity = EmacsActivity.lastFocusedActivity; | 933 | activity = EmacsActivity.lastFocusedActivity; |
| @@ -947,7 +947,7 @@ public final class EmacsService extends Service | |||
| 947 | 947 | ||
| 948 | if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) | 948 | if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) |
| 949 | /* Since the system predates drag and drop, return this resolver | 949 | /* Since the system predates drag and drop, return this resolver |
| 950 | to avoid any unforseen difficulties. */ | 950 | to avoid any unforeseen difficulties. */ |
| 951 | return this; | 951 | return this; |
| 952 | 952 | ||
| 953 | activity = EmacsActivity.lastFocusedActivity; | 953 | activity = EmacsActivity.lastFocusedActivity; |
diff --git a/java/org/gnu/emacs/EmacsView.java b/java/org/gnu/emacs/EmacsView.java index 2d53231fbf9..5795f476f63 100644 --- a/java/org/gnu/emacs/EmacsView.java +++ b/java/org/gnu/emacs/EmacsView.java | |||
| @@ -388,7 +388,7 @@ public final class EmacsView extends ViewGroup | |||
| 388 | && !rootWindowInsets.isVisible (WindowInsets.Type.ime ()) | 388 | && !rootWindowInsets.isVisible (WindowInsets.Type.ime ()) |
| 389 | /* N.B. that the keyboard is dismissed during gesture | 389 | /* N.B. that the keyboard is dismissed during gesture |
| 390 | navigation under Android 30, but the system is | 390 | navigation under Android 30, but the system is |
| 391 | quite tempermental regarding whether the window is | 391 | quite temperamental regarding whether the window is |
| 392 | focused at that point. Ideally | 392 | focused at that point. Ideally |
| 393 | isCurrentlyTextEditor shouldn't be reset in that | 393 | isCurrentlyTextEditor shouldn't be reset in that |
| 394 | case, but detecting that situation appears to be | 394 | case, but detecting that situation appears to be |
diff --git a/java/org/gnu/emacs/EmacsWindow.java b/java/org/gnu/emacs/EmacsWindow.java index 7d161fdcf88..2c446913eba 100644 --- a/java/org/gnu/emacs/EmacsWindow.java +++ b/java/org/gnu/emacs/EmacsWindow.java | |||
| @@ -1399,7 +1399,7 @@ public final class EmacsWindow extends EmacsHandleObject | |||
| 1399 | } | 1399 | } |
| 1400 | 1400 | ||
| 1401 | /* Effect the same adjustment upon the view | 1401 | /* Effect the same adjustment upon the view |
| 1402 | hiearchy. */ | 1402 | hierarchy. */ |
| 1403 | 1403 | ||
| 1404 | EmacsService.SERVICE.runOnUiThread (new Runnable () { | 1404 | EmacsService.SERVICE.runOnUiThread (new Runnable () { |
| 1405 | @Override | 1405 | @Override |
diff --git a/lisp/button.el b/lisp/button.el index ed11c9583d8..4d66fc57d87 100644 --- a/lisp/button.el +++ b/lisp/button.el | |||
| @@ -494,7 +494,7 @@ pushing a button, use the `button-describe' command." | |||
| 494 | (button-activate str t) | 494 | (button-activate str t) |
| 495 | (if (eq (car-safe pos) 'touchscreen-down) | 495 | (if (eq (car-safe pos) 'touchscreen-down) |
| 496 | ;; If touch-screen-track tap returns nil, then the | 496 | ;; If touch-screen-track tap returns nil, then the |
| 497 | ;; tap was cancelled. | 497 | ;; tap was canceled. |
| 498 | (when (touch-screen-track-tap pos nil nil t) | 498 | (when (touch-screen-track-tap pos nil nil t) |
| 499 | (push-button (posn-point posn) t)) | 499 | (push-button (posn-point posn) t)) |
| 500 | (push-button (posn-point posn) t)))))) | 500 | (push-button (posn-point posn) t)))))) |
diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el index 7a61a8fce7e..5a72011c609 100644 --- a/lisp/emacs-lisp/byte-opt.el +++ b/lisp/emacs-lisp/byte-opt.el | |||
| @@ -440,7 +440,7 @@ There can be multiple entries for the same NAME if it has several aliases.") | |||
| 440 | 440 | ||
| 441 | (`(unwind-protect ,protected-expr :fun-body ,unwind-fun) | 441 | (`(unwind-protect ,protected-expr :fun-body ,unwind-fun) |
| 442 | ;; FIXME: The return value of UNWIND-FUN is never used so we | 442 | ;; FIXME: The return value of UNWIND-FUN is never used so we |
| 443 | ;; could potentially optimise it for-effect, but we don't do | 443 | ;; could potentially optimize it for-effect, but we don't do |
| 444 | ;; that right no. | 444 | ;; that right no. |
| 445 | `(,fn ,(byte-optimize-form protected-expr for-effect) | 445 | `(,fn ,(byte-optimize-form protected-expr for-effect) |
| 446 | :fun-body ,(byte-optimize-form unwind-fun))) | 446 | :fun-body ,(byte-optimize-form unwind-fun))) |
| @@ -973,7 +973,7 @@ There can be multiple entries for the same NAME if it has several aliases.") | |||
| 973 | (list (car form) (nth 2 form) (nth 1 form))))) | 973 | (list (car form) (nth 2 form) (nth 1 form))))) |
| 974 | 974 | ||
| 975 | (defun byte-opt--nary-comparison (form) | 975 | (defun byte-opt--nary-comparison (form) |
| 976 | "Optimise n-ary comparisons such as `=', `<' etc." | 976 | "Optimize n-ary comparisons such as `=', `<' etc." |
| 977 | (let ((nargs (length (cdr form)))) | 977 | (let ((nargs (length (cdr form)))) |
| 978 | (cond | 978 | (cond |
| 979 | ((= nargs 1) | 979 | ((= nargs 1) |
| @@ -988,7 +988,7 @@ There can be multiple entries for the same NAME if it has several aliases.") | |||
| 988 | (if (memq nil (mapcar #'macroexp-copyable-p (cddr form))) | 988 | (if (memq nil (mapcar #'macroexp-copyable-p (cddr form))) |
| 989 | ;; At least one arg beyond the first is non-constant non-variable: | 989 | ;; At least one arg beyond the first is non-constant non-variable: |
| 990 | ;; create temporaries for all args to guard against side-effects. | 990 | ;; create temporaries for all args to guard against side-effects. |
| 991 | ;; The optimiser will eliminate trivial bindings later. | 991 | ;; The optimizer will eliminate trivial bindings later. |
| 992 | (let ((i 1)) | 992 | (let ((i 1)) |
| 993 | (dolist (arg (cdr form)) | 993 | (dolist (arg (cdr form)) |
| 994 | (let ((var (make-symbol (format "arg%d" i)))) | 994 | (let ((var (make-symbol (format "arg%d" i)))) |
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index 64fd4f6b3f3..950ae77803c 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el | |||
| @@ -3566,7 +3566,7 @@ lambda-expression." | |||
| 3566 | (cond | 3566 | (cond |
| 3567 | ((and sef (or (eq sef 'error-free) | 3567 | ((and sef (or (eq sef 'error-free) |
| 3568 | byte-compile-delete-errors)) | 3568 | byte-compile-delete-errors)) |
| 3569 | ;; This transform is normally done in the Lisp optimiser, | 3569 | ;; This transform is normally done in the Lisp optimizer, |
| 3570 | ;; so maybe we don't need to bother about it here? | 3570 | ;; so maybe we don't need to bother about it here? |
| 3571 | (setq form (cons 'progn (cdr form))) | 3571 | (setq form (cons 'progn (cdr form))) |
| 3572 | (setq handler #'byte-compile-progn)) | 3572 | (setq handler #'byte-compile-progn)) |
| @@ -3603,7 +3603,7 @@ lambda-expression." | |||
| 3603 | (let ((important-return-value-fns | 3603 | (let ((important-return-value-fns |
| 3604 | '( | 3604 | '( |
| 3605 | ;; These functions are side-effect-free except for the | 3605 | ;; These functions are side-effect-free except for the |
| 3606 | ;; behaviour of functions passed as argument. | 3606 | ;; behavior of functions passed as argument. |
| 3607 | mapcar mapcan mapconcat | 3607 | mapcar mapcan mapconcat |
| 3608 | assoc plist-get plist-member | 3608 | assoc plist-get plist-member |
| 3609 | 3609 | ||
| @@ -4148,7 +4148,7 @@ If it is nil, then the handler is \"byte-compile-SYMBOL.\"" | |||
| 4148 | (byte-compile-two-args | 4148 | (byte-compile-two-args |
| 4149 | (if (macroexp-const-p (nth 1 form)) | 4149 | (if (macroexp-const-p (nth 1 form)) |
| 4150 | ;; First argument is constant: flip it so that the constant | 4150 | ;; First argument is constant: flip it so that the constant |
| 4151 | ;; is last, which may allow more lapcode optimisations. | 4151 | ;; is last, which may allow more lapcode optimizations. |
| 4152 | (let* ((op (car form)) | 4152 | (let* ((op (car form)) |
| 4153 | (flipped-op (cdr (assq op '((< . >) (<= . >=) | 4153 | (flipped-op (cdr (assq op '((< . >) (<= . >=) |
| 4154 | (> . <) (>= . <=) (= . =)))))) | 4154 | (> . <) (>= . <=) (= . =)))))) |
| @@ -4312,7 +4312,7 @@ This function is never called when `lexical-binding' is nil." | |||
| 4312 | (arg2 (nth 2 form))) | 4312 | (arg2 (nth 2 form))) |
| 4313 | (when (and (memq (car form) '(+ *)) | 4313 | (when (and (memq (car form) '(+ *)) |
| 4314 | (macroexp-const-p arg1)) | 4314 | (macroexp-const-p arg1)) |
| 4315 | ;; Put constant argument last for better LAP optimisation. | 4315 | ;; Put constant argument last for better LAP optimization. |
| 4316 | (cl-rotatef arg1 arg2)) | 4316 | (cl-rotatef arg1 arg2)) |
| 4317 | (byte-compile-form arg1) | 4317 | (byte-compile-form arg1) |
| 4318 | (byte-compile-form arg2) | 4318 | (byte-compile-form arg2) |
| @@ -5326,7 +5326,7 @@ FORM is used to provide location, `bytecomp--cus-function' and | |||
| 5326 | "Warn about common mistakes in the `defcustom' type TYPE." | 5326 | "Warn about common mistakes in the `defcustom' type TYPE." |
| 5327 | (let ((invalid-types | 5327 | (let ((invalid-types |
| 5328 | '( | 5328 | '( |
| 5329 | ;; Lisp type predicates, often confused with customisation types: | 5329 | ;; Lisp type predicates, often confused with customization types: |
| 5330 | functionp numberp integerp fixnump natnump floatp booleanp | 5330 | functionp numberp integerp fixnump natnump floatp booleanp |
| 5331 | characterp listp stringp consp vectorp symbolp keywordp | 5331 | characterp listp stringp consp vectorp symbolp keywordp |
| 5332 | hash-table-p facep | 5332 | hash-table-p facep |
diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el index 2431e658368..7b69404cfac 100644 --- a/lisp/emacs-lisp/cl-macs.el +++ b/lisp/emacs-lisp/cl-macs.el | |||
| @@ -3739,7 +3739,7 @@ macro that returns its `&whole' argument." | |||
| 3739 | (mapc (lambda (x) (function-put x 'important-return-value t)) | 3739 | (mapc (lambda (x) (function-put x 'important-return-value t)) |
| 3740 | '( | 3740 | '( |
| 3741 | ;; Functions that are side-effect-free except for the | 3741 | ;; Functions that are side-effect-free except for the |
| 3742 | ;; behaviour of functions passed as argument. | 3742 | ;; behavior of functions passed as argument. |
| 3743 | cl-mapcar cl-mapcan cl-maplist cl-map cl-mapcon | 3743 | cl-mapcar cl-mapcan cl-maplist cl-map cl-mapcon |
| 3744 | cl-reduce | 3744 | cl-reduce |
| 3745 | cl-assoc cl-assoc-if cl-assoc-if-not | 3745 | cl-assoc cl-assoc-if cl-assoc-if-not |
diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el index e28d73c3555..4ee825136c9 100644 --- a/lisp/emacs-lisp/eldoc.el +++ b/lisp/emacs-lisp/eldoc.el | |||
| @@ -607,7 +607,7 @@ known to be truncated." | |||
| 607 | 607 | ||
| 608 | (defun eldoc-display-in-echo-area (docs interactive) | 608 | (defun eldoc-display-in-echo-area (docs interactive) |
| 609 | "Display DOCS in echo area. | 609 | "Display DOCS in echo area. |
| 610 | INTERACTIVE is non-nil if user explictly invoked ElDoc. Honor | 610 | INTERACTIVE is non-nil if user explicitly invoked ElDoc. Honor |
| 611 | `eldoc-echo-area-use-multiline-p' and | 611 | `eldoc-echo-area-use-multiline-p' and |
| 612 | `eldoc-echo-area-prefer-doc-buffer'." | 612 | `eldoc-echo-area-prefer-doc-buffer'." |
| 613 | (cond | 613 | (cond |
| @@ -933,7 +933,7 @@ the docstrings eventually produced, using | |||
| 933 | (let* ((eldoc--make-callback #'make-callback) | 933 | (let* ((eldoc--make-callback #'make-callback) |
| 934 | (res (funcall eldoc-documentation-strategy))) | 934 | (res (funcall eldoc-documentation-strategy))) |
| 935 | ;; Observe the old and the new protocol: | 935 | ;; Observe the old and the new protocol: |
| 936 | (cond (;; Old protocol: got string, e-d-strategy is iself the | 936 | (cond (;; Old protocol: got string, e-d-strategy is itself the |
| 937 | ;; origin function, and we output immediately; | 937 | ;; origin function, and we output immediately; |
| 938 | (stringp res) | 938 | (stringp res) |
| 939 | (register-doc 0 res nil eldoc-documentation-strategy) | 939 | (register-doc 0 res nil eldoc-documentation-strategy) |
diff --git a/lisp/emacs-lisp/ert-font-lock.el b/lisp/emacs-lisp/ert-font-lock.el index 6a02cf7acc4..8bde83bf278 100644 --- a/lisp/emacs-lisp/ert-font-lock.el +++ b/lisp/emacs-lisp/ert-font-lock.el | |||
| @@ -28,7 +28,7 @@ | |||
| 28 | ;; | 28 | ;; |
| 29 | ;; ert-font-lock entry points are functions | 29 | ;; ert-font-lock entry points are functions |
| 30 | ;; `ert-font-lock-test-string' and `ert-font-lock-test-file' and | 30 | ;; `ert-font-lock-test-string' and `ert-font-lock-test-file' and |
| 31 | ;; covenience macros: `ert-font-lock-deftest' and | 31 | ;; convenience macros: `ert-font-lock-deftest' and |
| 32 | ;; `ert-font-lock-deftest-file'. | 32 | ;; `ert-font-lock-deftest-file'. |
| 33 | ;; | 33 | ;; |
| 34 | ;; See unit tests in ert-font-lock-tests.el for usage examples. | 34 | ;; See unit tests in ert-font-lock-tests.el for usage examples. |
diff --git a/lisp/emacs-lisp/gv.el b/lisp/emacs-lisp/gv.el index 5d31253fe2d..9f40c1f3c93 100644 --- a/lisp/emacs-lisp/gv.el +++ b/lisp/emacs-lisp/gv.el | |||
| @@ -638,7 +638,7 @@ REF must have been previously obtained with `gv-ref'." | |||
| 638 | 638 | ||
| 639 | ;;; Generalized variables. | 639 | ;;; Generalized variables. |
| 640 | 640 | ||
| 641 | ;; You'd think noone would write `(setf (error ...) ..)' but it | 641 | ;; You'd think no one would write `(setf (error ...) ..)' but it |
| 642 | ;; appears naturally as the result of macroexpansion of things like | 642 | ;; appears naturally as the result of macroexpansion of things like |
| 643 | ;; (setf (pcase-exhaustive ...)). | 643 | ;; (setf (pcase-exhaustive ...)). |
| 644 | ;; We could generalize this to `throw' and `signal', but it seems | 644 | ;; We could generalize this to `throw' and `signal', but it seems |
diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el index bc36762cb2d..bef498f997c 100644 --- a/lisp/emacs-lisp/package-vc.el +++ b/lisp/emacs-lisp/package-vc.el | |||
| @@ -863,7 +863,7 @@ package uses `file-name-base' on the URL to obtain the package | |||
| 863 | name, otherwise NAME is the package name as a symbol. | 863 | name, otherwise NAME is the package name as a symbol. |
| 864 | 864 | ||
| 865 | PACKAGE can also be a cons cell (PNAME . SPEC) where PNAME is the | 865 | PACKAGE can also be a cons cell (PNAME . SPEC) where PNAME is the |
| 866 | package name as a symbol, and SPEC is a plist that specifes how | 866 | package name as a symbol, and SPEC is a plist that specifies how |
| 867 | to fetch and build the package. For possible values, see the | 867 | to fetch and build the package. For possible values, see the |
| 868 | subsection \"Specifying Package Sources\" in the Info | 868 | subsection \"Specifying Package Sources\" in the Info |
| 869 | node `(emacs)Fetching Package Sources'. | 869 | node `(emacs)Fetching Package Sources'. |
diff --git a/lisp/erc/erc-status-sidebar.el b/lisp/erc/erc-status-sidebar.el index d2ecce94bcd..98d5a321385 100644 --- a/lisp/erc/erc-status-sidebar.el +++ b/lisp/erc/erc-status-sidebar.el | |||
| @@ -130,7 +130,7 @@ buffers, using the functions | |||
| 130 | `erc-status-sidebar-pad-hierarchy' | 130 | `erc-status-sidebar-pad-hierarchy' |
| 131 | 131 | ||
| 132 | for the above-mentioned purposes. ERC also accepts a list of | 132 | for the above-mentioned purposes. ERC also accepts a list of |
| 133 | functions to preform these roles a la carte. Since the members | 133 | functions to perform these roles a la carte. Since the members |
| 134 | of the above sets aren't really interoperable, we don't offer | 134 | of the above sets aren't really interoperable, we don't offer |
| 135 | them here as customization choices, but you can still specify | 135 | them here as customization choices, but you can still specify |
| 136 | them manually. See doc strings for a description of their | 136 | them manually. See doc strings for a description of their |
diff --git a/lisp/eshell/em-hist.el b/lisp/eshell/em-hist.el index 79336204847..9b1bc009079 100644 --- a/lisp/eshell/em-hist.el +++ b/lisp/eshell/em-hist.el | |||
| @@ -399,7 +399,7 @@ input." | |||
| 399 | ('nil t) ; Always add to history | 399 | ('nil t) ; Always add to history |
| 400 | ('erase ; Add, removing any old occurrences | 400 | ('erase ; Add, removing any old occurrences |
| 401 | (when-let ((old-index (ring-member eshell-history-ring input))) | 401 | (when-let ((old-index (ring-member eshell-history-ring input))) |
| 402 | ;; Remove the old occurence of this input so we can | 402 | ;; Remove the old occurrence of this input so we can |
| 403 | ;; add it to the end. FIXME: Should we try to | 403 | ;; add it to the end. FIXME: Should we try to |
| 404 | ;; remove multiple old occurrences, e.g. if the user | 404 | ;; remove multiple old occurrences, e.g. if the user |
| 405 | ;; recently changed to using `erase'? | 405 | ;; recently changed to using `erase'? |
diff --git a/lisp/jsonrpc.el b/lisp/jsonrpc.el index 849a8d8eaee..7726712d056 100644 --- a/lisp/jsonrpc.el +++ b/lisp/jsonrpc.el | |||
| @@ -158,7 +158,7 @@ immediately." | |||
| 158 | (defvar jsonrpc-inhibit-debug-on-error nil | 158 | (defvar jsonrpc-inhibit-debug-on-error nil |
| 159 | "Inhibit `debug-on-error' when answering requests. | 159 | "Inhibit `debug-on-error' when answering requests. |
| 160 | Some extensions, notably ert.el, set `debug-on-error' to non-nil, | 160 | Some extensions, notably ert.el, set `debug-on-error' to non-nil, |
| 161 | which makes it hard to test the behaviour of catching the Elisp | 161 | which makes it hard to test the behavior of catching the Elisp |
| 162 | error and replying to the endpoint with an JSONRPC-error. This | 162 | error and replying to the endpoint with an JSONRPC-error. This |
| 163 | variable can be set around calls like `jsonrpc-request' to | 163 | variable can be set around calls like `jsonrpc-request' to |
| 164 | circumvent that.") | 164 | circumvent that.") |
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el index e5c5fd62f8c..a9814fb0bac 100644 --- a/lisp/minibuffer.el +++ b/lisp/minibuffer.el | |||
| @@ -1685,7 +1685,7 @@ names, where this is the directory component of the file name.") | |||
| 1685 | "Sort COMPLETIONS by their position in `minibuffer-history-variable'. | 1685 | "Sort COMPLETIONS by their position in `minibuffer-history-variable'. |
| 1686 | 1686 | ||
| 1687 | COMPLETIONS are sorted first by `minibuffer-sort-alphbetically', | 1687 | COMPLETIONS are sorted first by `minibuffer-sort-alphbetically', |
| 1688 | then any elements occuring in the minibuffer history list are | 1688 | then any elements occurring in the minibuffer history list are |
| 1689 | moved to the front based on the chronological order they occur in | 1689 | moved to the front based on the chronological order they occur in |
| 1690 | the history. If a history variable hasn't been specified for | 1690 | the history. If a history variable hasn't been specified for |
| 1691 | this call of `completing-read', COMPLETIONS are sorted only by | 1691 | this call of `completing-read', COMPLETIONS are sorted only by |
| @@ -4942,7 +4942,7 @@ This is run upon minibuffer setup." | |||
| 4942 | (defun minibuffer-exit-on-screen-keyboard () | 4942 | (defun minibuffer-exit-on-screen-keyboard () |
| 4943 | "Hide the on-screen keyboard if it was displayed. | 4943 | "Hide the on-screen keyboard if it was displayed. |
| 4944 | Hide the on-screen keyboard in a timer set to run in 0.1 seconds. | 4944 | Hide the on-screen keyboard in a timer set to run in 0.1 seconds. |
| 4945 | It will be cancelled if the minibuffer is displayed again within | 4945 | It will be canceled if the minibuffer is displayed again within |
| 4946 | that timeframe. | 4946 | that timeframe. |
| 4947 | 4947 | ||
| 4948 | Do not hide the on screen keyboard inside a recursive edit. | 4948 | Do not hide the on screen keyboard inside a recursive edit. |
diff --git a/lisp/net/shr.el b/lisp/net/shr.el index 9f030b4c743..e0888c61496 100644 --- a/lisp/net/shr.el +++ b/lisp/net/shr.el | |||
| @@ -200,7 +200,7 @@ inline if it occupies less than this fraction of window width. | |||
| 200 | 200 | ||
| 201 | HEIGHT can be also be an integer or a floating point number. If it is an | 201 | HEIGHT can be also be an integer or a floating point number. If it is an |
| 202 | integer and the pixel height of an image exceeds it, the image image is | 202 | integer and the pixel height of an image exceeds it, the image image is |
| 203 | displyed on a separate line. If it is a float number , the limit is | 203 | displayed on a separate line. If it is a float number , the limit is |
| 204 | interpreted as a multiple of the height of default font." | 204 | interpreted as a multiple of the height of default font." |
| 205 | :version "30.1" | 205 | :version "30.1" |
| 206 | :type '(choice (const nil) (cons number number))) | 206 | :type '(choice (const nil) (cons number number))) |
diff --git a/lisp/net/tramp-crypt.el b/lisp/net/tramp-crypt.el index 379b8b70656..0d79f88f10c 100644 --- a/lisp/net/tramp-crypt.el +++ b/lisp/net/tramp-crypt.el | |||
| @@ -856,7 +856,7 @@ WILDCARD is not supported." | |||
| 856 | 'unlock-file (tramp-crypt-encrypt-file-name filename)))) | 856 | 'unlock-file (tramp-crypt-encrypt-file-name filename)))) |
| 857 | 857 | ||
| 858 | (defun tramp-crypt-cleanup-connection (vec) | 858 | (defun tramp-crypt-cleanup-connection (vec) |
| 859 | "Cleanup crypt ressources determined by VEC." | 859 | "Cleanup crypt resources determined by VEC." |
| 860 | (let ((tramp-cleanup-connection-hook | 860 | (let ((tramp-cleanup-connection-hook |
| 861 | (remove | 861 | (remove |
| 862 | #'tramp-crypt-cleanup-connection tramp-cleanup-connection-hook))) | 862 | #'tramp-crypt-cleanup-connection tramp-cleanup-connection-hook))) |
diff --git a/lisp/net/tramp-message.el b/lisp/net/tramp-message.el index 8afc8d5fd87..e05357f1f4f 100644 --- a/lisp/net/tramp-message.el +++ b/lisp/net/tramp-message.el | |||
| @@ -515,7 +515,7 @@ This shouldn't be changed globally, but let-bind where needed.") | |||
| 515 | Bound in `tramp-*-file-name-handler' functions.") | 515 | Bound in `tramp-*-file-name-handler' functions.") |
| 516 | 516 | ||
| 517 | (defun tramp-debug-message-buttonize (position) | 517 | (defun tramp-debug-message-buttonize (position) |
| 518 | "Buttonize function in current buffer, at next line starting after POSTION." | 518 | "Buttonize function in current buffer, at next line starting after POSITION." |
| 519 | (declare (tramp-suppress-trace t)) | 519 | (declare (tramp-suppress-trace t)) |
| 520 | (save-excursion | 520 | (save-excursion |
| 521 | (goto-char position) | 521 | (goto-char position) |
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index 018a194ac14..6154253e6b3 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el | |||
| @@ -7554,7 +7554,7 @@ multi-line strings (but not C++, for example)." | |||
| 7554 | (defun c-ml-string-opener-intersects-region (&optional start finish) | 7554 | (defun c-ml-string-opener-intersects-region (&optional start finish) |
| 7555 | ;; If any part of the region [START FINISH] is inside an ml-string opener, | 7555 | ;; If any part of the region [START FINISH] is inside an ml-string opener, |
| 7556 | ;; return a dotted list of the start, end and double-quote position of the | 7556 | ;; return a dotted list of the start, end and double-quote position of the |
| 7557 | ;; first such opener. That list wlll not include any "context characters" | 7557 | ;; first such opener. That list will not include any "context characters" |
| 7558 | ;; before or after the opener. If an opener is found, the match-data will | 7558 | ;; before or after the opener. If an opener is found, the match-data will |
| 7559 | ;; indicate it, with (match-string 1) being the entire delimiter, and | 7559 | ;; indicate it, with (match-string 1) being the entire delimiter, and |
| 7560 | ;; (match-string 2) the "main" double-quote. Otherwise, the match-data is | 7560 | ;; (match-string 2) the "main" double-quote. Otherwise, the match-data is |
| @@ -9891,7 +9891,7 @@ point unchanged and return nil." | |||
| 9891 | ;; Note that this function is incomplete, handling only those cases expected | 9891 | ;; Note that this function is incomplete, handling only those cases expected |
| 9892 | ;; to be common in a C++20 requires clause. | 9892 | ;; to be common in a C++20 requires clause. |
| 9893 | ;; | 9893 | ;; |
| 9894 | ;; Note also that (...) is not recognised as a primary expression if the | 9894 | ;; Note also that (...) is not recognized as a primary expression if the |
| 9895 | ;; next token is an open brace. | 9895 | ;; next token is an open brace. |
| 9896 | (let ((here (point)) | 9896 | (let ((here (point)) |
| 9897 | (c-restricted-<>-arglists t) | 9897 | (c-restricted-<>-arglists t) |
| @@ -13021,7 +13021,7 @@ comment at the start of cc-engine.el for more info." | |||
| 13021 | 13021 | ||
| 13022 | (defun c-laomib-get-cache (containing-sexp start) | 13022 | (defun c-laomib-get-cache (containing-sexp start) |
| 13023 | ;; Get an element from `c-laomib-cache' matching CONTAINING-SEXP, and which | 13023 | ;; Get an element from `c-laomib-cache' matching CONTAINING-SEXP, and which |
| 13024 | ;; is suitable for start postiion START. | 13024 | ;; is suitable for start position START. |
| 13025 | ;; Return that element or nil if one wasn't found. | 13025 | ;; Return that element or nil if one wasn't found. |
| 13026 | (let ((ptr c-laomib-cache) | 13026 | (let ((ptr c-laomib-cache) |
| 13027 | elt) | 13027 | elt) |
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el index 02185972bfe..58cf2728f61 100644 --- a/lisp/progmodes/cperl-mode.el +++ b/lisp/progmodes/cperl-mode.el | |||
| @@ -4206,7 +4206,7 @@ recursive calls in starting lines of here-documents." | |||
| 4206 | (setq tmpend tb)) | 4206 | (setq tmpend tb)) |
| 4207 | (put-text-property b (point) 'syntax-type 'format)) | 4207 | (put-text-property b (point) 'syntax-type 'format)) |
| 4208 | ;; quotelike operator or regexp: capture groups 10 or 11 | 4208 | ;; quotelike operator or regexp: capture groups 10 or 11 |
| 4209 | ;; matches some false postives, to be eliminated here | 4209 | ;; matches some false positives, to be eliminated here |
| 4210 | ((or (match-beginning 10) (match-beginning 11)) | 4210 | ((or (match-beginning 10) (match-beginning 11)) |
| 4211 | (setq b1 (if (match-beginning 10) 10 11) | 4211 | (setq b1 (if (match-beginning 10) 10 11) |
| 4212 | argument (buffer-substring | 4212 | argument (buffer-substring |
| @@ -5877,7 +5877,7 @@ functions (which they are not). Inherits from `default'.") | |||
| 5877 | (eval cperl--ws*-rx)) | 5877 | (eval cperl--ws*-rx)) |
| 5878 | ;; ... or the start of a "sloppy" signature | 5878 | ;; ... or the start of a "sloppy" signature |
| 5879 | (sequence (eval cperl--sloppy-signature-rx) | 5879 | (sequence (eval cperl--sloppy-signature-rx) |
| 5880 | ;; arbtrarily continue "a few lines" | 5880 | ;; arbitrarily continue "a few lines" |
| 5881 | (repeat 0 200 (not (in "{")))) | 5881 | (repeat 0 200 (not (in "{")))) |
| 5882 | ;; make sure we have a reasonably | 5882 | ;; make sure we have a reasonably |
| 5883 | ;; short match for an incomplete sub | 5883 | ;; short match for an incomplete sub |
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el index eb35287cabe..0f0bb73ae77 100644 --- a/lisp/progmodes/gud.el +++ b/lisp/progmodes/gud.el | |||
| @@ -3974,11 +3974,11 @@ def gud_complete(s, max): | |||
| 3974 | print(f'\"{string_list.GetStringAtIndex(i)}\" ') | 3974 | print(f'\"{string_list.GetStringAtIndex(i)}\" ') |
| 3975 | print(')##') | 3975 | print(')##') |
| 3976 | " | 3976 | " |
| 3977 | "Python code sent to LLDB for gud-specific initialisation.") | 3977 | "Python code sent to LLDB for gud-specific initialization.") |
| 3978 | 3978 | ||
| 3979 | (defun gud-lldb-fetch-completions (context command) | 3979 | (defun gud-lldb-fetch-completions (context command) |
| 3980 | "Return the data to complete the LLDB command before point. | 3980 | "Return the data to complete the LLDB command before point. |
| 3981 | This is what the Python function we installed at initialzation | 3981 | This is what the Python function we installed at initialization |
| 3982 | time returns, as a Lisp list. | 3982 | time returns, as a Lisp list. |
| 3983 | Maximum number of completions requested from LLDB is controlled | 3983 | Maximum number of completions requested from LLDB is controlled |
| 3984 | by `gud-lldb-max-completions', which see." | 3984 | by `gud-lldb-max-completions', which see." |
diff --git a/lisp/simple.el b/lisp/simple.el index d60acf5477a..cee1ddac52f 100644 --- a/lisp/simple.el +++ b/lisp/simple.el | |||
| @@ -11178,7 +11178,7 @@ For each insertion: | |||
| 11178 | enabled. | 11178 | enabled. |
| 11179 | 11179 | ||
| 11180 | - Look for the deletion of a single electric pair character, | 11180 | - Look for the deletion of a single electric pair character, |
| 11181 | and delete the adjascent pair if | 11181 | and delete the adjacent pair if |
| 11182 | `electric-pair-delete-adjacent-pairs'. | 11182 | `electric-pair-delete-adjacent-pairs'. |
| 11183 | 11183 | ||
| 11184 | - Run `post-self-insert-hook' for the last character of | 11184 | - Run `post-self-insert-hook' for the last character of |
diff --git a/lisp/term/android-win.el b/lisp/term/android-win.el index 36470097b40..3e759a37a71 100644 --- a/lisp/term/android-win.el +++ b/lisp/term/android-win.el | |||
| @@ -340,7 +340,7 @@ the `stop-selecting-text' editing key." | |||
| 340 | 340 | ||
| 341 | 341 | ||
| 342 | ;; Splash screen notice. Users are frequently left scratching their | 342 | ;; Splash screen notice. Users are frequently left scratching their |
| 343 | ;; heads when they overlook the Android appendex in the Emacs manual | 343 | ;; heads when they overlook the Android appendix in the Emacs manual |
| 344 | ;; and discover that external storage is not accessible; worse yet, | 344 | ;; and discover that external storage is not accessible; worse yet, |
| 345 | ;; Android 11 and later veil the settings panel controlling such | 345 | ;; Android 11 and later veil the settings panel controlling such |
| 346 | ;; permissions behind layer upon layer of largely immaterial settings | 346 | ;; permissions behind layer upon layer of largely immaterial settings |
diff --git a/lisp/touch-screen.el b/lisp/touch-screen.el index bae0e097688..a10bdea8994 100644 --- a/lisp/touch-screen.el +++ b/lisp/touch-screen.el | |||
| @@ -57,7 +57,7 @@ touch point being tracked, the window where the touch began, a | |||
| 57 | cons holding the initial position of the touch point, and the | 57 | cons holding the initial position of the touch point, and the |
| 58 | last known position of the touch point, all in the same format as | 58 | last known position of the touch point, all in the same format as |
| 59 | in `touch-screen-current-tool', the distance in pixels between | 59 | in `touch-screen-current-tool', the distance in pixels between |
| 60 | the current tool and the aformentioned initial position, the | 60 | the current tool and the aforementioned initial position, the |
| 61 | center of the line formed between those two points, the ratio | 61 | center of the line formed between those two points, the ratio |
| 62 | between the present distance between both tools and the aforesaid | 62 | between the present distance between both tools and the aforesaid |
| 63 | initial distance when a pinch gesture was last sent, and three | 63 | initial distance when a pinch gesture was last sent, and three |
| @@ -1927,7 +1927,7 @@ with that event and DATA. | |||
| 1927 | 1927 | ||
| 1928 | If THRESHOLD is non-nil, enforce a threshold of movement that is | 1928 | If THRESHOLD is non-nil, enforce a threshold of movement that is |
| 1929 | either itself or 10 pixels when it is not a number. If the | 1929 | either itself or 10 pixels when it is not a number. If the |
| 1930 | aformentioned touch point moves beyond that threshold on any | 1930 | aforementioned touch point moves beyond that threshold on any |
| 1931 | axis, return nil immediately, and further resume mouse event | 1931 | axis, return nil immediately, and further resume mouse event |
| 1932 | translation for the touch point at hand. | 1932 | translation for the touch point at hand. |
| 1933 | 1933 | ||
diff --git a/lisp/transient.el b/lisp/transient.el index 94f7700ddaf..ebf6f23f6cd 100644 --- a/lisp/transient.el +++ b/lisp/transient.el | |||
| @@ -1514,7 +1514,7 @@ invoked from. | |||
| 1514 | Regular suffix commands, which are not prefixes, do not have to | 1514 | Regular suffix commands, which are not prefixes, do not have to |
| 1515 | concern themselves with this distinction, so they can use this | 1515 | concern themselves with this distinction, so they can use this |
| 1516 | function instead. In the context of a plain suffix, it always | 1516 | function instead. In the context of a plain suffix, it always |
| 1517 | returns the value of the appropiate variable." | 1517 | returns the value of the appropriate variable." |
| 1518 | (or transient--prefix transient-current-prefix)) | 1518 | (or transient--prefix transient-current-prefix)) |
| 1519 | 1519 | ||
| 1520 | (defun transient-suffix-object (&optional command) | 1520 | (defun transient-suffix-object (&optional command) |
diff --git a/lisp/treesit.el b/lisp/treesit.el index da8226f7d8a..9f885985f3b 100644 --- a/lisp/treesit.el +++ b/lisp/treesit.el | |||
| @@ -690,7 +690,7 @@ property. If LANGUAGE is non-nil, only return parsers for LANGUAGE." | |||
| 690 | 690 | ||
| 691 | (defun treesit--update-ranges-local | 691 | (defun treesit--update-ranges-local |
| 692 | (query embedded-lang &optional beg end) | 692 | (query embedded-lang &optional beg end) |
| 693 | "Update range for local parsers betwwen BEG and END. | 693 | "Update range for local parsers between BEG and END. |
| 694 | Use QUERY to get the ranges, and make sure each range has a local | 694 | Use QUERY to get the ranges, and make sure each range has a local |
| 695 | parser for EMBEDDED-LANG." | 695 | parser for EMBEDDED-LANG." |
| 696 | ;; Clean up. | 696 | ;; Clean up. |
diff --git a/lisp/use-package/use-package-core.el b/lisp/use-package/use-package-core.el index 34c45b7aec3..2897b60b2f9 100644 --- a/lisp/use-package/use-package-core.el +++ b/lisp/use-package/use-package-core.el | |||
| @@ -1619,7 +1619,7 @@ ARG is the normalized input to the `:vc' keyword, as returned by | |||
| 1619 | the `use-package-normalize/:vc' function. | 1619 | the `use-package-normalize/:vc' function. |
| 1620 | 1620 | ||
| 1621 | REST is a plist of other (following) keywords and their | 1621 | REST is a plist of other (following) keywords and their |
| 1622 | arguments, each having already been normalised by the respective | 1622 | arguments, each having already been normalized by the respective |
| 1623 | function. | 1623 | function. |
| 1624 | 1624 | ||
| 1625 | STATE is a plist of any state that keywords processed before | 1625 | STATE is a plist of any state that keywords processed before |
| @@ -1690,7 +1690,7 @@ node `(use-package) Creating an extension'." | |||
| 1690 | (`(,(pred symbolp) . ,(or (pred plistp) ; plist/version string + name | 1690 | (`(,(pred symbolp) . ,(or (pred plistp) ; plist/version string + name |
| 1691 | (pred stringp))) | 1691 | (pred stringp))) |
| 1692 | (use-package-normalize--vc-arg arg)) | 1692 | (use-package-normalize--vc-arg arg)) |
| 1693 | (_ (use-package-error "Unrecognised argument to :vc.\ | 1693 | (_ (use-package-error "Unrecognized argument to :vc.\ |
| 1694 | The keyword wants an argument of nil, t, a name of a package,\ | 1694 | The keyword wants an argument of nil, t, a name of a package,\ |
| 1695 | or a cons-cell as accepted by `package-vc-selected-packages', where \ | 1695 | or a cons-cell as accepted by `package-vc-selected-packages', where \ |
| 1696 | the accepted plist is augmented by a `:rev' keyword."))))) | 1696 | the accepted plist is augmented by a `:rev' keyword."))))) |
diff --git a/src/android.c b/src/android.c index 51622f16230..7a393f8f56d 100644 --- a/src/android.c +++ b/src/android.c | |||
| @@ -2779,7 +2779,7 @@ android_destroy_handle (android_handle handle) | |||
| 2779 | 2779 | ||
| 2780 | /* Just clear any exception thrown. If destroying the handle | 2780 | /* Just clear any exception thrown. If destroying the handle |
| 2781 | fails from an out-of-memory error, then Emacs loses some | 2781 | fails from an out-of-memory error, then Emacs loses some |
| 2782 | resources, but that is not as big deal as signalling. */ | 2782 | resources, but that is not as big deal as signaling. */ |
| 2783 | (*android_java_env)->ExceptionClear (android_java_env); | 2783 | (*android_java_env)->ExceptionClear (android_java_env); |
| 2784 | 2784 | ||
| 2785 | /* Delete the global reference regardless of any error. */ | 2785 | /* Delete the global reference regardless of any error. */ |
| @@ -5797,7 +5797,7 @@ android_check_string (Lisp_Object text) | |||
| 5797 | better represent the UCS-16 based Java String format, and to let | 5797 | better represent the UCS-16 based Java String format, and to let |
| 5798 | strings contain NULL characters while remaining valid C strings: | 5798 | strings contain NULL characters while remaining valid C strings: |
| 5799 | NULL bytes are encoded as two-byte sequences, and Unicode surrogate | 5799 | NULL bytes are encoded as two-byte sequences, and Unicode surrogate |
| 5800 | pairs encoded as two-byte sequences are prefered to four-byte | 5800 | pairs encoded as two-byte sequences are preferred to four-byte |
| 5801 | sequences when encoding characters above the BMP. */ | 5801 | sequences when encoding characters above the BMP. */ |
| 5802 | 5802 | ||
| 5803 | int | 5803 | int |
diff --git a/src/androidselect.c b/src/androidselect.c index f7988db0520..e7a6ee258a8 100644 --- a/src/androidselect.c +++ b/src/androidselect.c | |||
| @@ -299,7 +299,7 @@ data type available from the clipboard. */) | |||
| 299 | bytes_array); | 299 | bytes_array); |
| 300 | for (i = 0; i < length; ++i) | 300 | for (i = 0; i < length; ++i) |
| 301 | { | 301 | { |
| 302 | /* Retireve the MIME type. */ | 302 | /* Retrieve the MIME type. */ |
| 303 | bytes | 303 | bytes |
| 304 | = (*android_java_env)->GetObjectArrayElement (android_java_env, | 304 | = (*android_java_env)->GetObjectArrayElement (android_java_env, |
| 305 | bytes_array, i); | 305 | bytes_array, i); |
diff --git a/src/androidterm.c b/src/androidterm.c index cfb64cd69a0..c3a04fd3cfb 100644 --- a/src/androidterm.c +++ b/src/androidterm.c | |||
| @@ -6101,7 +6101,7 @@ android_update_selection (struct frame *f, struct window *w) | |||
| 6101 | else | 6101 | else |
| 6102 | start = -1, end = -1; | 6102 | start = -1, end = -1; |
| 6103 | 6103 | ||
| 6104 | /* Now constrain START and END to the maximium size of a Java | 6104 | /* Now constrain START and END to the maximum size of a Java |
| 6105 | integer. */ | 6105 | integer. */ |
| 6106 | start = min (start, TYPE_MAXIMUM (jint)); | 6106 | start = min (start, TYPE_MAXIMUM (jint)); |
| 6107 | end = min (end, TYPE_MAXIMUM (jint)); | 6107 | end = min (end, TYPE_MAXIMUM (jint)); |
| @@ -6238,7 +6238,7 @@ android_reset_conversion (struct frame *f) | |||
| 6238 | 6238 | ||
| 6239 | android_reset_ic (FRAME_ANDROID_WINDOW (f), mode); | 6239 | android_reset_ic (FRAME_ANDROID_WINDOW (f), mode); |
| 6240 | 6240 | ||
| 6241 | /* Clear extracted text flags. Since the IM has been reinitialised, | 6241 | /* Clear extracted text flags. Since the IM has been reinitialized, |
| 6242 | it should no longer be displaying extracted text. */ | 6242 | it should no longer be displaying extracted text. */ |
| 6243 | FRAME_ANDROID_OUTPUT (f)->extracted_text_flags = 0; | 6243 | FRAME_ANDROID_OUTPUT (f)->extracted_text_flags = 0; |
| 6244 | 6244 | ||
diff --git a/src/androidterm.h b/src/androidterm.h index e75d46b1dfb..9830cc4364d 100644 --- a/src/androidterm.h +++ b/src/androidterm.h | |||
| @@ -262,7 +262,7 @@ struct android_output | |||
| 262 | text''. */ | 262 | text''. */ |
| 263 | int extracted_text_flags; | 263 | int extracted_text_flags; |
| 264 | 264 | ||
| 265 | /* Token asssociated with that request. */ | 265 | /* Token associated with that request. */ |
| 266 | int extracted_text_token; | 266 | int extracted_text_token; |
| 267 | 267 | ||
| 268 | /* The number of characters of extracted text wanted by the IM. */ | 268 | /* The number of characters of extracted text wanted by the IM. */ |
diff --git a/src/androidvfs.c b/src/androidvfs.c index 51558d2a375..3b7fb731e86 100644 --- a/src/androidvfs.c +++ b/src/androidvfs.c | |||
| @@ -407,7 +407,7 @@ android_init_fd_class (JNIEnv *env) | |||
| 407 | values are prohibitively slow, but smaller values can't face up to | 407 | values are prohibitively slow, but smaller values can't face up to |
| 408 | some long file names within several nested layers of directories. | 408 | some long file names within several nested layers of directories. |
| 409 | 409 | ||
| 410 | Buffers holding components or other similar file name constitutents | 410 | Buffers holding components or other similar file name constituents |
| 411 | which don't represent SAF files must continue to use PATH_MAX, for | 411 | which don't represent SAF files must continue to use PATH_MAX, for |
| 412 | that is the restriction imposed by the Unix file system. */ | 412 | that is the restriction imposed by the Unix file system. */ |
| 413 | 413 | ||
| @@ -4179,7 +4179,7 @@ android_saf_stat (const char *uri_name, const char *id_name, | |||
| 4179 | } | 4179 | } |
| 4180 | 4180 | ||
| 4181 | /* Detect if Emacs has access to the document designated by the the | 4181 | /* Detect if Emacs has access to the document designated by the the |
| 4182 | documen ID ID_NAME within the tree URI_NAME. If ID_NAME is NULL, | 4182 | document ID ID_NAME within the tree URI_NAME. If ID_NAME is NULL, |
| 4183 | use the document ID in URI_NAME itself. | 4183 | use the document ID in URI_NAME itself. |
| 4184 | 4184 | ||
| 4185 | If WRITABLE, also check that the file is writable, which is true | 4185 | If WRITABLE, also check that the file is writable, which is true |
| @@ -6427,7 +6427,7 @@ android_root_name (struct android_vnode *vnode, char *name, | |||
| 6427 | if (!component_end) | 6427 | if (!component_end) |
| 6428 | component_end = name + length; | 6428 | component_end = name + length; |
| 6429 | else | 6429 | else |
| 6430 | /* Move past the spearator character. */ | 6430 | /* Move past the separator character. */ |
| 6431 | component_end++; | 6431 | component_end++; |
| 6432 | 6432 | ||
| 6433 | /* Now, find out if the first component is a special vnode; if so, | 6433 | /* Now, find out if the first component is a special vnode; if so, |
| @@ -7172,7 +7172,7 @@ android_readlinkat (int dirfd, const char *restrict pathname, | |||
| 7172 | while file streams also require ownership over file descriptors | 7172 | while file streams also require ownership over file descriptors |
| 7173 | they are created on behalf of. | 7173 | they are created on behalf of. |
| 7174 | 7174 | ||
| 7175 | Detaching the parcel file descriptor linked to FD consequentially | 7175 | Detaching the parcel file descriptor linked to FD consequently |
| 7176 | prevents the owner from being notified when it is eventually | 7176 | prevents the owner from being notified when it is eventually |
| 7177 | closed, but for now that hasn't been demonstrated to be problematic | 7177 | closed, but for now that hasn't been demonstrated to be problematic |
| 7178 | yet, as Emacs doesn't write to file streams. */ | 7178 | yet, as Emacs doesn't write to file streams. */ |
diff --git a/src/fileio.c b/src/fileio.c index 51937e6d765..64f255a355b 100644 --- a/src/fileio.c +++ b/src/fileio.c | |||
| @@ -203,7 +203,7 @@ check_vfs_filename (Lisp_Object encoded, const char *reason) | |||
| 203 | #ifdef HAVE_LIBSELINUX | 203 | #ifdef HAVE_LIBSELINUX |
| 204 | 204 | ||
| 205 | /* Return whether SELinux is enabled and pertinent to FILE. Provide | 205 | /* Return whether SELinux is enabled and pertinent to FILE. Provide |
| 206 | for cases where FILE is or is a constitutent of a special | 206 | for cases where FILE is or is a constituent of a special |
| 207 | directory, such as /assets or /content on Android. */ | 207 | directory, such as /assets or /content on Android. */ |
| 208 | 208 | ||
| 209 | static bool | 209 | static bool |
diff --git a/src/image.c b/src/image.c index 29ec6d5381b..38744fc1cce 100644 --- a/src/image.c +++ b/src/image.c | |||
| @@ -11785,7 +11785,7 @@ svg_css_length_to_pixels (RsvgLength length, double dpi, int font_size) | |||
| 11785 | 11785 | ||
| 11786 | If we do set explicit width and height values in the image | 11786 | If we do set explicit width and height values in the image |
| 11787 | spec, this will work out correctly as librsvg will still | 11787 | spec, this will work out correctly as librsvg will still |
| 11788 | honour the percentage sizes in its final rendering no matter | 11788 | honor the percentage sizes in its final rendering no matter |
| 11789 | what size we make the image. */ | 11789 | what size we make the image. */ |
| 11790 | value = 0; | 11790 | value = 0; |
| 11791 | break; | 11791 | break; |
diff --git a/src/process.c b/src/process.c index bde87b78701..8bc922ab509 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -7520,7 +7520,7 @@ handle_child_signal (int sig) | |||
| 7520 | 7520 | ||
| 7521 | emacs_unlink is not async signal safe because | 7521 | emacs_unlink is not async signal safe because |
| 7522 | deleting files from content providers must proceed | 7522 | deleting files from content providers must proceed |
| 7523 | through Java code. Consequentially, if XCDR (head) | 7523 | through Java code. Consequently, if XCDR (head) |
| 7524 | lies on a content provider it will not be removed, | 7524 | lies on a content provider it will not be removed, |
| 7525 | which is a bug. */ | 7525 | which is a bug. */ |
| 7526 | unlink (SSDATA (XCDR (head))); | 7526 | unlink (SSDATA (XCDR (head))); |
diff --git a/src/regex-emacs.c b/src/regex-emacs.c index cb4fbd58faa..19bec537130 100644 --- a/src/regex-emacs.c +++ b/src/regex-emacs.c | |||
| @@ -2824,7 +2824,7 @@ group_in_compile_stack (compile_stack_type compile_stack, regnum_t regnum) | |||
| 2824 | 2824 | ||
| 2825 | /* Iterate through all the char-matching operations directly reachable from P. | 2825 | /* Iterate through all the char-matching operations directly reachable from P. |
| 2826 | This is the inner loop of `forall_firstchar`, which see. | 2826 | This is the inner loop of `forall_firstchar`, which see. |
| 2827 | LOOP_BEG..LOOP_END delimit the currentl "block" of code (we assume | 2827 | LOOP_BEG..LOOP_END delimit the currently "block" of code (we assume |
| 2828 | the code is made of syntactically nested loops). | 2828 | the code is made of syntactically nested loops). |
| 2829 | LOOP_END is blindly assumed to be "safe". | 2829 | LOOP_END is blindly assumed to be "safe". |
| 2830 | To guarantee termination, at each iteration, either LOOP_BEG should | 2830 | To guarantee termination, at each iteration, either LOOP_BEG should |
diff --git a/src/sfnt.c b/src/sfnt.c index bc2ffdea9dc..238e7f48420 100644 --- a/src/sfnt.c +++ b/src/sfnt.c | |||
| @@ -4762,7 +4762,7 @@ sfnt_get_scale (struct sfnt_head_table *head, int ppem) | |||
| 4762 | /* Figure out how to convert from font unit-space to pixel space. | 4762 | /* Figure out how to convert from font unit-space to pixel space. |
| 4763 | To turn one unit to its corresponding pixel size given a ppem of | 4763 | To turn one unit to its corresponding pixel size given a ppem of |
| 4764 | 1, the unit must be divided by head->units_per_em. Then, it must | 4764 | 1, the unit must be divided by head->units_per_em. Then, it must |
| 4765 | be multipled by the ppem. So, | 4765 | be multiplied by the ppem. So, |
| 4766 | 4766 | ||
| 4767 | PIXEL = UNIT / UPEM * PPEM | 4767 | PIXEL = UNIT / UPEM * PPEM |
| 4768 | 4768 | ||
| @@ -4902,7 +4902,7 @@ sfnt_read_name_table (int fd, struct sfnt_offset_subtable *subtable) | |||
| 4902 | return NULL; | 4902 | return NULL; |
| 4903 | } | 4903 | } |
| 4904 | 4904 | ||
| 4905 | /* Read REQURIED bytes into the string data. */ | 4905 | /* Read REQUIRED bytes into the string data. */ |
| 4906 | name->data = (unsigned char *) (name->name_records | 4906 | name->data = (unsigned char *) (name->name_records |
| 4907 | + name->count); | 4907 | + name->count); |
| 4908 | rc = read (fd, name->data, required); | 4908 | rc = read (fd, name->data, required); |
| @@ -14256,7 +14256,7 @@ sfnt_infer_deltas_1 (struct sfnt_glyph *glyph, size_t start, | |||
| 14256 | } | 14256 | } |
| 14257 | else | 14257 | else |
| 14258 | { | 14258 | { |
| 14259 | /* ... otheriwse, move point j by the delta of the | 14259 | /* ... otherwise, move point j by the delta of the |
| 14260 | nearest touched point. */ | 14260 | nearest touched point. */ |
| 14261 | 14261 | ||
| 14262 | if (x[j] >= max_pos) | 14262 | if (x[j] >= max_pos) |
| @@ -14320,7 +14320,7 @@ sfnt_infer_deltas_1 (struct sfnt_glyph *glyph, size_t start, | |||
| 14320 | } | 14320 | } |
| 14321 | else | 14321 | else |
| 14322 | { | 14322 | { |
| 14323 | /* ... otheriwse, move point j by the delta of the | 14323 | /* ... otherwise, move point j by the delta of the |
| 14324 | nearest touched point. */ | 14324 | nearest touched point. */ |
| 14325 | 14325 | ||
| 14326 | if (y[j] >= max_pos) | 14326 | if (y[j] >= max_pos) |
| @@ -14404,7 +14404,7 @@ sfnt_infer_deltas_1 (struct sfnt_glyph *glyph, size_t start, | |||
| 14404 | } | 14404 | } |
| 14405 | else | 14405 | else |
| 14406 | { | 14406 | { |
| 14407 | /* ... otheriwse, move point j by the delta of the | 14407 | /* ... otherwise, move point j by the delta of the |
| 14408 | nearest touched point. */ | 14408 | nearest touched point. */ |
| 14409 | 14409 | ||
| 14410 | if (x[j] >= max_pos) | 14410 | if (x[j] >= max_pos) |
| @@ -14468,7 +14468,7 @@ sfnt_infer_deltas_1 (struct sfnt_glyph *glyph, size_t start, | |||
| 14468 | } | 14468 | } |
| 14469 | else | 14469 | else |
| 14470 | { | 14470 | { |
| 14471 | /* ... otheriwse, move point j by the delta of the | 14471 | /* ... otherwise, move point j by the delta of the |
| 14472 | nearest touched point. */ | 14472 | nearest touched point. */ |
| 14473 | 14473 | ||
| 14474 | if (y[j] >= max_pos) | 14474 | if (y[j] >= max_pos) |
| @@ -14557,7 +14557,7 @@ sfnt_infer_deltas (struct sfnt_glyph *glyph, bool *touched, | |||
| 14557 | of one or two coordinates for each axis. Each such list is | 14557 | of one or two coordinates for each axis. Each such list is |
| 14558 | referred to as a ``tuple''. | 14558 | referred to as a ``tuple''. |
| 14559 | 14559 | ||
| 14560 | The deltas, one for each point, are multipled by the normalized | 14560 | The deltas, one for each point, are multiplied by the normalized |
| 14561 | value of each axis and applied to those points for each tuple that | 14561 | value of each axis and applied to those points for each tuple that |
| 14562 | is found to be applicable. | 14562 | is found to be applicable. |
| 14563 | 14563 | ||
diff --git a/src/sfnt.h b/src/sfnt.h index f6ab6a6eebd..42ae64c362b 100644 --- a/src/sfnt.h +++ b/src/sfnt.h | |||
| @@ -1283,7 +1283,7 @@ struct sfnt_gvar_table | |||
| 1283 | unsigned char *glyph_variation_data; | 1283 | unsigned char *glyph_variation_data; |
| 1284 | }; | 1284 | }; |
| 1285 | 1285 | ||
| 1286 | /* Structure repesenting a set of axis coordinates and their | 1286 | /* Structure representing a set of axis coordinates and their |
| 1287 | normalized equivalents. | 1287 | normalized equivalents. |
| 1288 | 1288 | ||
| 1289 | To use this structure, call | 1289 | To use this structure, call |
diff --git a/src/sfntfont.c b/src/sfntfont.c index 68e850779fc..f002712dc10 100644 --- a/src/sfntfont.c +++ b/src/sfntfont.c | |||
| @@ -1348,7 +1348,7 @@ sfntfont_charset_for_cmap (struct sfnt_cmap_encoding_subtable subtable) | |||
| 1348 | subtable in *SUBTABLE upon success, NULL otherwise. | 1348 | subtable in *SUBTABLE upon success, NULL otherwise. |
| 1349 | 1349 | ||
| 1350 | If FORMAT14 is non-NULL, return any associated format 14 variation | 1350 | If FORMAT14 is non-NULL, return any associated format 14 variation |
| 1351 | selection context in *FORMAT14 should the selected charcter map be | 1351 | selection context in *FORMAT14 should the selected character map be |
| 1352 | a Unicode character map. */ | 1352 | a Unicode character map. */ |
| 1353 | 1353 | ||
| 1354 | static struct sfnt_cmap_encoding_subtable_data * | 1354 | static struct sfnt_cmap_encoding_subtable_data * |
| @@ -1371,7 +1371,7 @@ sfntfont_select_cmap (struct sfnt_cmap_table *cmap, | |||
| 1371 | if (!format14) | 1371 | if (!format14) |
| 1372 | return data[i]; | 1372 | return data[i]; |
| 1373 | 1373 | ||
| 1374 | /* Search for a correspoinding format 14 character map. | 1374 | /* Search for a corresponding format 14 character map. |
| 1375 | This is used in conjunction with the selected character | 1375 | This is used in conjunction with the selected character |
| 1376 | map to map variation sequences. */ | 1376 | map to map variation sequences. */ |
| 1377 | 1377 | ||
| @@ -1400,7 +1400,7 @@ sfntfont_select_cmap (struct sfnt_cmap_table *cmap, | |||
| 1400 | if (!format14) | 1400 | if (!format14) |
| 1401 | return data[i]; | 1401 | return data[i]; |
| 1402 | 1402 | ||
| 1403 | /* Search for a correspoinding format 14 character map. | 1403 | /* Search for a corresponding format 14 character map. |
| 1404 | This is used in conjunction with the selected character | 1404 | This is used in conjunction with the selected character |
| 1405 | map to map variation sequences. */ | 1405 | map to map variation sequences. */ |
| 1406 | 1406 | ||
diff --git a/src/textconv.c b/src/textconv.c index bd72562317f..fb1c66bb2c2 100644 --- a/src/textconv.c +++ b/src/textconv.c | |||
| @@ -23,7 +23,7 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */ | |||
| 23 | They may then request that the text editor remove or substitute | 23 | They may then request that the text editor remove or substitute |
| 24 | that text for something else, for example when providing the | 24 | that text for something else, for example when providing the |
| 25 | ability to ``undo'' or ``edit'' previously composed text. This is | 25 | ability to ``undo'' or ``edit'' previously composed text. This is |
| 26 | most commonly seen in input methods for CJK laguages for X Windows, | 26 | most commonly seen in input methods for CJK languages for X Windows, |
| 27 | and is extensively used throughout Android by input methods for all | 27 | and is extensively used throughout Android by input methods for all |
| 28 | kinds of scripts. | 28 | kinds of scripts. |
| 29 | 29 | ||
| @@ -1311,7 +1311,7 @@ struct complete_edit_check_context | |||
| 1311 | 1311 | ||
| 1312 | /* Convert PTR to CONTEXT. If CONTEXT->check is false, then update | 1312 | /* Convert PTR to CONTEXT. If CONTEXT->check is false, then update |
| 1313 | CONTEXT->w's ephemeral last point and give it to the input method, | 1313 | CONTEXT->w's ephemeral last point and give it to the input method, |
| 1314 | the assumption being that an editing operation signalled. */ | 1314 | the assumption being that an editing operation signaled. */ |
| 1315 | 1315 | ||
| 1316 | static void | 1316 | static void |
| 1317 | complete_edit_check (void *ptr) | 1317 | complete_edit_check (void *ptr) |
| @@ -1379,7 +1379,7 @@ handle_pending_conversion_events_1 (struct frame *f, | |||
| 1379 | or not the editing operation completed successfully. */ | 1379 | or not the editing operation completed successfully. */ |
| 1380 | context.check = false; | 1380 | context.check = false; |
| 1381 | 1381 | ||
| 1382 | /* Make sure completion is signalled. */ | 1382 | /* Make sure completion is signaled. */ |
| 1383 | count = SPECPDL_INDEX (); | 1383 | count = SPECPDL_INDEX (); |
| 1384 | record_unwind_protect_ptr (complete_edit, &token); | 1384 | record_unwind_protect_ptr (complete_edit, &token); |
| 1385 | w = NULL; | 1385 | w = NULL; |
diff --git a/src/treesit.c b/src/treesit.c index 69b59fca111..912f4ed47cc 100644 --- a/src/treesit.c +++ b/src/treesit.c | |||
| @@ -3335,7 +3335,7 @@ treesit_traverse_validate_predicate (Lisp_Object pred, | |||
| 3335 | if (!CONSP (cdr)) | 3335 | if (!CONSP (cdr)) |
| 3336 | { | 3336 | { |
| 3337 | *signal_data = list3 (Qtreesit_invalid_predicate, | 3337 | *signal_data = list3 (Qtreesit_invalid_predicate, |
| 3338 | build_string ("Invalide `not' " | 3338 | build_string ("Invalid `not' " |
| 3339 | "predicate"), | 3339 | "predicate"), |
| 3340 | pred); | 3340 | pred); |
| 3341 | return false; | 3341 | return false; |
diff --git a/src/window.h b/src/window.h index 9ef8434af18..346dc70ea98 100644 --- a/src/window.h +++ b/src/window.h | |||
| @@ -292,7 +292,7 @@ struct window | |||
| 292 | 292 | ||
| 293 | `last_point' is normally used during redisplay to indicate the | 293 | `last_point' is normally used during redisplay to indicate the |
| 294 | position of point as seem by the input method. However, it is | 294 | position of point as seem by the input method. However, it is |
| 295 | not updated if consequtive conversions are processed at the | 295 | not updated if consecutive conversions are processed at the |
| 296 | same time. | 296 | same time. |
| 297 | 297 | ||
| 298 | This `ephemeral_last_point' field is either the last point as | 298 | This `ephemeral_last_point' field is either the last point as |
diff --git a/src/xselect.c b/src/xselect.c index c38a1f8b6a9..5ffa0fd24fc 100644 --- a/src/xselect.c +++ b/src/xselect.c | |||
| @@ -897,7 +897,7 @@ x_start_selection_transfer (struct x_display_info *dpyinfo, Window requestor, | |||
| 897 | 897 | ||
| 898 | /* Find a valid (non-zero) serial for the selection transfer. | 898 | /* Find a valid (non-zero) serial for the selection transfer. |
| 899 | Any asynchronously trapped errors will then cause the | 899 | Any asynchronously trapped errors will then cause the |
| 900 | selection transfer to be cancelled. */ | 900 | selection transfer to be canceled. */ |
| 901 | transfer->serial = (++selection_serial | 901 | transfer->serial = (++selection_serial |
| 902 | ? selection_serial | 902 | ? selection_serial |
| 903 | : ++selection_serial); | 903 | : ++selection_serial); |
diff --git a/src/xterm.c b/src/xterm.c index 75ac8d0d555..79648a6d6e5 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -616,9 +616,9 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */ | |||
| 616 | - x_clear_errors | 616 | - x_clear_errors |
| 617 | 617 | ||
| 618 | Callers using this set should consult the comment(s) on top of the | 618 | Callers using this set should consult the comment(s) on top of the |
| 619 | aformentioned functions. They should not be used when the requests | 619 | aforementioned functions. They should not be used when the requests |
| 620 | being made do not require roundtrips to the X server, and obtaining | 620 | being made do not require roundtrips to the X server, and obtaining |
| 621 | the details of any error generated is unecessary, as | 621 | the details of any error generated is unnecessary, as |
| 622 | `x_uncatch_errors' will always synchronize with the X server, which | 622 | `x_uncatch_errors' will always synchronize with the X server, which |
| 623 | is a potentially slow operation. */ | 623 | is a potentially slow operation. */ |
| 624 | 624 | ||
| @@ -5173,7 +5173,7 @@ record_event (char *locus, int type) | |||
| 5173 | 5173 | ||
| 5174 | 5174 | ||
| 5175 | 5175 | ||
| 5176 | /* Miscelaneous event handling functions. */ | 5176 | /* Miscellaneous event handling functions. */ |
| 5177 | 5177 | ||
| 5178 | static void | 5178 | static void |
| 5179 | x_toolkit_position (struct frame *f, int x, int y, | 5179 | x_toolkit_position (struct frame *f, int x, int y, |
| @@ -11296,7 +11296,7 @@ x_clear_frame (struct frame *f) | |||
| 11296 | 11296 | ||
| 11297 | /* Send a message to frame F telling the event loop to track whether | 11297 | /* Send a message to frame F telling the event loop to track whether |
| 11298 | or not an hourglass is being displayed. This is required to ignore | 11298 | or not an hourglass is being displayed. This is required to ignore |
| 11299 | the right events when the hourglass is mapped without callig XSync | 11299 | the right events when the hourglass is mapped without calling XSync |
| 11300 | after displaying or hiding the hourglass. */ | 11300 | after displaying or hiding the hourglass. */ |
| 11301 | 11301 | ||
| 11302 | static void | 11302 | static void |
| @@ -32094,7 +32094,7 @@ x_initialize (void) | |||
| 32094 | 32094 | ||
| 32095 | #ifdef HAVE_X_I18N | 32095 | #ifdef HAVE_X_I18N |
| 32096 | 32096 | ||
| 32097 | /* Notice that a change has occured on F that requires its input | 32097 | /* Notice that a change has occurred on F that requires its input |
| 32098 | method state to be reset. */ | 32098 | method state to be reset. */ |
| 32099 | 32099 | ||
| 32100 | static void | 32100 | static void |
diff --git a/test/lisp/emacs-lisp/bytecomp-tests.el b/test/lisp/emacs-lisp/bytecomp-tests.el index 27056c99a50..8fbe48bbb9a 100644 --- a/test/lisp/emacs-lisp/bytecomp-tests.el +++ b/test/lisp/emacs-lisp/bytecomp-tests.el | |||
| @@ -717,7 +717,7 @@ inner loops respectively." | |||
| 717 | (set (make-local-variable 'bytecomp-tests--xx) 2) | 717 | (set (make-local-variable 'bytecomp-tests--xx) 2) |
| 718 | bytecomp-tests--xx) | 718 | bytecomp-tests--xx) |
| 719 | 719 | ||
| 720 | ;; Check for-effect optimisation of `condition-case' body form. | 720 | ;; Check for-effect optimization of `condition-case' body form. |
| 721 | ;; With `condition-case' in for-effect context: | 721 | ;; With `condition-case' in for-effect context: |
| 722 | (let ((x (bytecomp-test-identity ?A)) | 722 | (let ((x (bytecomp-test-identity ?A)) |
| 723 | (r nil)) | 723 | (r nil)) |
| @@ -797,7 +797,7 @@ inner loops respectively." | |||
| 797 | (let ((x 0)) | 797 | (let ((x 0)) |
| 798 | (list (= (setq x 1)) | 798 | (list (= (setq x 1)) |
| 799 | x)) | 799 | x)) |
| 800 | ;; Aristotelian identity optimisation | 800 | ;; Aristotelian identity optimization |
| 801 | (let ((x (bytecomp-test-identity 1))) | 801 | (let ((x (bytecomp-test-identity 1))) |
| 802 | (list (eq x x) (eql x x) (equal x x))) | 802 | (list (eq x x) (eql x x) (equal x x))) |
| 803 | ) | 803 | ) |
| @@ -2120,7 +2120,7 @@ EXPECTED-POINT BINDINGS (MODES \\='\\='(ruby-mode js-mode python-mode)) \ | |||
| 2120 | )) | 2120 | )) |
| 2121 | 2121 | ||
| 2122 | (ert-deftest bytecomp--byte-op-error-backtrace () | 2122 | (ert-deftest bytecomp--byte-op-error-backtrace () |
| 2123 | "Check that signalling byte ops show up in the backtrace." | 2123 | "Check that signaling byte ops show up in the backtrace." |
| 2124 | (dolist (case bytecomp-tests--byte-op-error-cases) | 2124 | (dolist (case bytecomp-tests--byte-op-error-cases) |
| 2125 | (ert-info ((prin1-to-string case) :prefix "case: ") | 2125 | (ert-info ((prin1-to-string case) :prefix "case: ") |
| 2126 | (let* ((call (nth 0 case)) | 2126 | (let* ((call (nth 0 case)) |
| @@ -2151,7 +2151,7 @@ EXPECTED-POINT BINDINGS (MODES \\='\\='(ruby-mode js-mode python-mode)) \ | |||
| 2151 | call)))))))))) | 2151 | call)))))))))) |
| 2152 | 2152 | ||
| 2153 | (ert-deftest bytecomp--eq-symbols-with-pos-enabled () | 2153 | (ert-deftest bytecomp--eq-symbols-with-pos-enabled () |
| 2154 | ;; Verify that we don't optimise away a binding of | 2154 | ;; Verify that we don't optimize away a binding of |
| 2155 | ;; `symbols-with-pos-enabled' around an application of `eq' (bug#65017). | 2155 | ;; `symbols-with-pos-enabled' around an application of `eq' (bug#65017). |
| 2156 | (let* ((sym-with-pos1 (read-positioning-symbols "sym")) | 2156 | (let* ((sym-with-pos1 (read-positioning-symbols "sym")) |
| 2157 | (sym-with-pos2 (read-positioning-symbols " sym")) ; <- space! | 2157 | (sym-with-pos2 (read-positioning-symbols " sym")) ; <- space! |
diff --git a/test/lisp/erc/erc-scenarios-base-attach.el b/test/lisp/erc/erc-scenarios-base-attach.el index ccf5d1f9582..29f5bd2ddd8 100644 --- a/test/lisp/erc/erc-scenarios-base-attach.el +++ b/test/lisp/erc/erc-scenarios-base-attach.el | |||
| @@ -47,11 +47,11 @@ | |||
| 47 | ;; Author: Mario Lang <mlang@delysid.org> | 47 | ;; Author: Mario Lang <mlang@delysid.org> |
| 48 | ;; AuthorDate: Mon Nov 26 18:33:19 2001 +0000 | 48 | ;; AuthorDate: Mon Nov 26 18:33:19 2001 +0000 |
| 49 | ;; | 49 | ;; |
| 50 | ;; * new function erc-BBDB-NICK to handle nickname anotation ... | 50 | ;; * new function erc-BBDB-NICK to handle nickname annotation ... |
| 51 | ;; * Applied antifuchs/mhp patches, the latest on erc-help, unmodified | 51 | ;; * Applied antifuchs/mhp patches, the latest on erc-help, unmodified |
| 52 | ;; * New variable: erc-reuse-buffers default to t. | 52 | ;; * New variable: erc-reuse-buffers default to t. |
| 53 | ;; * Modified erc-generate-new-buffer-name to use it. it checks if | 53 | ;; * Modified erc-generate-new-buffer-name to use it. it checks if |
| 54 | ;; server and port are the same, then one can assume thats the same | 54 | ;; server and port are the same, then one can assume that's the same |
| 55 | ;; channel/query target again. | 55 | ;; channel/query target again. |
| 56 | 56 | ||
| 57 | ;;; Code: | 57 | ;;; Code: |
diff --git a/test/lisp/erc/erc-tests.el b/test/lisp/erc/erc-tests.el index 912a85ad5e0..e9bca2a3ac3 100644 --- a/test/lisp/erc/erc-tests.el +++ b/test/lisp/erc/erc-tests.el | |||
| @@ -657,7 +657,7 @@ | |||
| 657 | (setq erc--isupport-params (make-hash-table)) | 657 | (setq erc--isupport-params (make-hash-table)) |
| 658 | 658 | ||
| 659 | ;; Uses fallback values when no PREFIX parameter yet received, thus | 659 | ;; Uses fallback values when no PREFIX parameter yet received, thus |
| 660 | ;; ensuring caller can use slot accessors immediately intead of | 660 | ;; ensuring caller can use slot accessors immediately instead of |
| 661 | ;; checking if null beforehand. | 661 | ;; checking if null beforehand. |
| 662 | (should-not erc--parsed-prefix) | 662 | (should-not erc--parsed-prefix) |
| 663 | (should (equal (erc--parsed-prefix) | 663 | (should (equal (erc--parsed-prefix) |
| @@ -2918,7 +2918,7 @@ | |||
| 2918 | (while (accept-process-output proc 10)) | 2918 | (while (accept-process-output proc 10)) |
| 2919 | (goto-char (point-min)) | 2919 | (goto-char (point-min)) |
| 2920 | (unless (equal (read (current-buffer)) expected) | 2920 | (unless (equal (read (current-buffer)) expected) |
| 2921 | (message "Exepcted: %S\nGot: %s" expected (buffer-string)) | 2921 | (message "Expected: %S\nGot: %s" expected (buffer-string)) |
| 2922 | (ert-fail "Mismatch")))) | 2922 | (ert-fail "Mismatch")))) |
| 2923 | 2923 | ||
| 2924 | ;; Worrying about which library a module comes from is mostly not | 2924 | ;; Worrying about which library a module comes from is mostly not |
diff --git a/test/lisp/eshell/em-hist-tests.el b/test/lisp/eshell/em-hist-tests.el index 466d19cc6f7..078bcb490e5 100644 --- a/test/lisp/eshell/em-hist-tests.el +++ b/test/lisp/eshell/em-hist-tests.el | |||
| @@ -35,7 +35,7 @@ | |||
| 35 | (cl-defun em-hist-test/check-history-file (file-name expected &optional | 35 | (cl-defun em-hist-test/check-history-file (file-name expected &optional |
| 36 | (expected-ring t)) | 36 | (expected-ring t)) |
| 37 | "Check that the contents of FILE-NAME match the EXPECTED history entries. | 37 | "Check that the contents of FILE-NAME match the EXPECTED history entries. |
| 38 | Additonally, check that after loading the file, the history ring | 38 | Additionally, check that after loading the file, the history ring |
| 39 | matches too. If EXPECTED-RING is a list, compare the ring | 39 | matches too. If EXPECTED-RING is a list, compare the ring |
| 40 | elements against that; if t (the default), check against EXPECTED." | 40 | elements against that; if t (the default), check against EXPECTED." |
| 41 | (when (eq expected-ring t) (setq expected-ring expected)) | 41 | (when (eq expected-ring t) (setq expected-ring expected)) |
diff --git a/test/lisp/eshell/esh-io-tests.el b/test/lisp/eshell/esh-io-tests.el index 0201b6ab650..bc3d9c6e5d5 100644 --- a/test/lisp/eshell/esh-io-tests.el +++ b/test/lisp/eshell/esh-io-tests.el | |||
| @@ -328,7 +328,7 @@ stdout originally pointed (the terminal)." | |||
| 328 | "tuodts\nrredts\n")) | 328 | "tuodts\nrredts\n")) |
| 329 | 329 | ||
| 330 | (ert-deftest esh-io-test/pipeline/subcommands () | 330 | (ert-deftest esh-io-test/pipeline/subcommands () |
| 331 | "Chek that all commands in a subcommand are properly piped." | 331 | "Check that all commands in a subcommand are properly piped." |
| 332 | (skip-unless (executable-find "rev")) | 332 | (skip-unless (executable-find "rev")) |
| 333 | (with-temp-eshell | 333 | (with-temp-eshell |
| 334 | (eshell-match-command-output "{echo foo; echo bar} | rev" | 334 | (eshell-match-command-output "{echo foo; echo bar} | rev" |
diff --git a/test/lisp/proced-tests.el b/test/lisp/proced-tests.el index 44596f92490..58d97f46c4f 100644 --- a/test/lisp/proced-tests.el +++ b/test/lisp/proced-tests.el | |||
| @@ -46,7 +46,7 @@ | |||
| 46 | (move-to-column (string-match attribute proced-header-line))) | 46 | (move-to-column (string-match attribute proced-header-line))) |
| 47 | 47 | ||
| 48 | (defun proced--assert-process-valid-pid-refinement (pid) | 48 | (defun proced--assert-process-valid-pid-refinement (pid) |
| 49 | "Fail unless the process at point could be present after a refinment using PID." | 49 | "Fail unless the process at point could be present after a refinement using PID." |
| 50 | (proced--move-to-column "PID") | 50 | (proced--move-to-column "PID") |
| 51 | (let ((pid-equal (string= pid (word-at-point)))) | 51 | (let ((pid-equal (string= pid (word-at-point)))) |
| 52 | (should | 52 | (should |
diff --git a/test/lisp/thingatpt-tests.el b/test/lisp/thingatpt-tests.el index 7cf41d2817b..98ebf771717 100644 --- a/test/lisp/thingatpt-tests.el +++ b/test/lisp/thingatpt-tests.el | |||
| @@ -85,16 +85,16 @@ | |||
| 85 | ("<foo@example.com>" 5 email "<foo@example.com>") | 85 | ("<foo@example.com>" 5 email "<foo@example.com>") |
| 86 | ("<foo@example.com>" 16 email "<foo@example.com>") | 86 | ("<foo@example.com>" 16 email "<foo@example.com>") |
| 87 | ("<foo@example.com>" 17 email "<foo@example.com>") | 87 | ("<foo@example.com>" 17 email "<foo@example.com>") |
| 88 | ;; email adresses containing numbers | 88 | ;; email addresses containing numbers |
| 89 | ("foo1@example.com" 1 email "foo1@example.com") | 89 | ("foo1@example.com" 1 email "foo1@example.com") |
| 90 | ("1foo@example.com" 1 email "1foo@example.com") | 90 | ("1foo@example.com" 1 email "1foo@example.com") |
| 91 | ("11@example.com" 1 email "11@example.com") | 91 | ("11@example.com" 1 email "11@example.com") |
| 92 | ("1@example.com" 1 email "1@example.com") | 92 | ("1@example.com" 1 email "1@example.com") |
| 93 | ;; email adresses user portion containing dots | 93 | ;; email addresses user portion containing dots |
| 94 | ("foo.bar@example.com" 1 email "foo.bar@example.com") | 94 | ("foo.bar@example.com" 1 email "foo.bar@example.com") |
| 95 | (".foobar@example.com" 1 email nil) | 95 | (".foobar@example.com" 1 email nil) |
| 96 | (".foobar@example.com" 2 email "foobar@example.com") | 96 | (".foobar@example.com" 2 email "foobar@example.com") |
| 97 | ;; email adresses domain portion containing dots and dashes | 97 | ;; email addresses domain portion containing dots and dashes |
| 98 | ("foobar@.example.com" 1 email nil) | 98 | ("foobar@.example.com" 1 email nil) |
| 99 | ("foobar@-example.com" 1 email "foobar@-example.com") | 99 | ("foobar@-example.com" 1 email "foobar@-example.com") |
| 100 | ;; These are illegal, but thingatpt doesn't yet handle them | 100 | ;; These are illegal, but thingatpt doesn't yet handle them |
diff --git a/test/src/regex-emacs-tests.el b/test/src/regex-emacs-tests.el index 615d905e140..2912ce8a571 100644 --- a/test/src/regex-emacs-tests.el +++ b/test/src/regex-emacs-tests.el | |||
| @@ -912,7 +912,7 @@ This evaluates the TESTS test cases from glibc." | |||
| 912 | )) | 912 | )) |
| 913 | 913 | ||
| 914 | (ert-deftest regexp-tests-zero-width-assertion-repetition () | 914 | (ert-deftest regexp-tests-zero-width-assertion-repetition () |
| 915 | ;; Check compatibility behaviour with repetition operators after | 915 | ;; Check compatibility behavior with repetition operators after |
| 916 | ;; certain zero-width assertions (bug#64128). | 916 | ;; certain zero-width assertions (bug#64128). |
| 917 | 917 | ||
| 918 | ;; This function is just to hide ugly regexps from relint so that it | 918 | ;; This function is just to hide ugly regexps from relint so that it |