From: Stefan Kangas Date: Sun, 16 Jun 2024 19:59:42 +0000 (+0200) Subject: ; Fix typos X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ffc497a088ee413f4fbd3a6635f3227d865858f8;p=emacs.git ; Fix typos (cherry picked from commit c0eefebabfee011f0ec7631d055e482e4965a24d) --- diff --git a/ChangeLog.3 b/ChangeLog.3 index 46fc57cd0c0..1398b9bcf53 100644 --- a/ChangeLog.3 +++ b/ChangeLog.3 @@ -11216,7 +11216,7 @@ Rename flymake--backend-state to flymake--state - The previous name was confusing and akward and dreadful to type and + The previous name was confusing and awkward and dreadful to type and read. * lisp/progmodes/flymake.el (flymake--state): Rename from @@ -28256,7 +28256,7 @@ We used to `bset_enable_multibyte_characters` while the buffer is not empty, putting the buffer temporarily in an inconsistent state. - Further simplifications along the way: Prefer re-using local var `histvar` + Further simplifications along the way: Prefer reusing local var `histvar` and let `insert` do the unibyte<->multibyte conversion if needed. 2021-04-20 Eli Zaretskii @@ -50574,7 +50574,7 @@ Make XEmacs entry in the FAQ more contemporary * doc/misc/efaq.texi (Difference between Emacs and XEmacs): Make - XEmacs entry in the FAQ more contemporary. Remove part about re-using + XEmacs entry in the FAQ more contemporary. Remove part about reusing XEmacs code; this is not likely to be relevant these days and in any case is not a frequently asked question. (Bug#45235) @@ -83494,7 +83494,7 @@ 6b297519b5 Fix cl-most-positive-float doc typo c36c5a3ded ; lisp/ldefs-boot.el: Update. 3876a60569 Fix a typo in calculator.el - 9e832ba91b * lisp/erc/erc.el: Add URL to the new ERC page on the Emac... + 9e832ba91b * lisp/erc/erc.el: Add URL to the new ERC page on the Emacs... # Conflicts: # etc/NEWS @@ -128371,7 +128371,7 @@ Merge from origin/emacs-26 - 9254885 (origin/emacs-26) Resurrect display-line-number-mode in clien... + 9254885 (origin/emacs-26) Resurrect display-line-number-mode in client... aecbbd5 * src/fns.c (Fmapconcat): Doc fix. (Bug#35710) 8e5fc38 Fix typo ee21b40 * lisp/term/w32-win.el ([noname]): Bind to 'ignore'. (Bug#36... @@ -134042,7 +134042,7 @@ 9d7e08d (origin/emacs-26) Avoid false positives and false negatives o... 75b589c Fix markup related to quoting in Info - fd6ff29 Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emac... + fd6ff29 Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emacs... cd2204f Add a package: line to c-submit-bug-report. a992dca ; Remove empty NEWS sections ea67270 ; Add NEWS sections for 26.3 @@ -148868,7 +148868,7 @@ 2c8ea46 Revert "* etc/NEWS: Note setting make-cursor-line-fully-visib... f8df6f2 * etc/NEWS: Note setting make-cursor-line-fully-visible to ni... cdca208 Fix note about interactive advice (Bug#32905) - 508c40e Comple fix for Bug#32550 + 508c40e Complete fix for Bug#32550 2018-10-03 Glenn Morris @@ -157301,7 +157301,7 @@ Merge from origin/emacs-26 - 76f692e Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emac... + 76f692e Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emacs... 2018-06-02 Glenn Morris @@ -157310,7 +157310,7 @@ 90bea37 ; * etc/PROBLEMS: Fix fvwm version number in last commit af82d1f * etc/PROBLEMS: Document stickiness problem with FVWM (Bug#31... 4a3aed2 Update Emacs Lisp Intro to match current behavior - 21f2247 Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emac... + 21f2247 Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emacs... 3257085 Fix previous commit 6d23525 Fix typos in several manuals (Bug#31610) 9188291 Add detailed documentation about lock files @@ -159803,7 +159803,7 @@ ad731b0 ; * doc/lispref/display.texi (Temporary Displays): Fix typos. f1450e9 Complete documentation of syntax flags by adding `c' 6bdcaec Fix typos and minor wording issues in ELisp manual - febac27 Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emac... + febac27 Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emacs... 6c2e21e Avoid segfault in processes of type 'pipe' 60e10c5 Remove repetitions in documentation strings 208e752 * lisp/image.el (image-load-path): Doc fix. @@ -162780,7 +162780,7 @@ d523e4a Remove some unused spam.el variables 501808c Replace some obsolete aliases in code 19afff3 Replace some obsolete aliases in documentation - c797bc9 Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emac... + c797bc9 Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emacs... 0efe0bd Obsolete eshell-cmpl-suffix-list add48d2 More minor changes in the Glossary of the Emacs manual f6bd7e0 Revert last commit @@ -163219,7 +163219,7 @@ fd50238 (origin/emacs-26) * doc/lispref/streams.texi (Output Variable... 769ea57 Use "GTK+" where applicable in the manual 5e69219 Document print-escape-control-characters - c00fea9 Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emac... + c00fea9 Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emacs... a2ab0d0 * doc/emacs/killing.texi (Rectangles): Don't use @key for cha... 6288c3d * lisp/emulation/viper.el: Unbreak it. bf3535e More fixes in the Emacs manual @@ -163800,7 +163800,7 @@ 593bbda Document comment-fill-column in the manual (Bug#11636) bd4cc8d * doc/emacs/dired.texi (Marks vs Flags): Copyedits. 69107f3 ; Fix doc typos related to indefinite articles - aaad1e6 Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emac... + aaad1e6 Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emacs... 5906418 More fixes for the Emacs manual 9ab3df1 ; Fix doc typos related to indefinite articles 66a4e65 ; Fix doc typos related to indefinite articles @@ -174726,7 +174726,7 @@ 2018-10-01 Michael Albinus - Comple fix for Bug#32550 + Complete fix for Bug#32550 * lisp/net/tramp.el (tramp-rfn-eshadow-update-overlay): Use `save-excursion'. This completes the fix of Bug#32550. @@ -217743,7 +217743,7 @@ baa8ba4 * lisp/subr.el (start-process): Doc fix. (Bug#24693) e535ca4 Fix display of vc-dir CVS file statuses in subdirectories 12da149 Update URL of MS-Windows optional DLLs - 2331056 Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emac... + 2331056 Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs... a4285bc * lisp/simple.el (process-menu-mode, list-processes--refresh)... b0c447e * lisp/ibuf-ext.el (ibuffer-do-shell-command-file): Fix non-f... cf3c19b * lisp/ibuffer.el (ibuffer): Improve 'other-window' case. (B... @@ -220415,7 +220415,7 @@ 5ccd593 ; Fix typo in /etc/NEWS 96e3d16 * etc/NEWS: Mention the change in json-encode-string. 2e524034 ; * etc/NEWS: Mention incompatible change in url-http-create... - 2e4e74e Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emac... + 2e4e74e Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs... 66dea65 ; * doc/lispref/windows.texi (Window Parameters): Grammar twe... # Conflicts: @@ -228688,7 +228688,7 @@ 3283271 * src/xsmfns.c (syms_of_xsmfns): Remove stray "s in doc strings. a1f221b Comint and compile no longer set EMACS 5c28890 * lisp/subr.el (read-key): Don't let the prompt linger (bug#2... - a75b9a6 Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emac... + a75b9a6 Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs... c93ae7a Allow to customize names of executables used by grep.el f6497c6 Set locale encoding to UTF-8 when run from OS X GUI. 7ad1d07 Avoid signaling errors in 'M-n' at the 'C-x C-f' prompt diff --git a/ChangeLog.4 b/ChangeLog.4 index a9450fdba6c..fa55bc0fe55 100644 --- a/ChangeLog.4 +++ b/ChangeLog.4 @@ -7999,7 +7999,7 @@ Given an inlay hints at position POS, its attached to [POS, POS+1] if it's kind=1 (usually type hints) and [POS-1, POS] otherwise. For kind=1 hints, the 'cursor position of the first such overlay is also - tweaked, so that's it's less akward to edit around it. + tweaked, so that's it's less awkward to edit around it. * lisp/progmodes/eglot.el (eglot--before-change): Don't delete hints here. @@ -35893,7 +35893,7 @@ Merge from origin/emacs-28 395760dcd3 Update ChangeLog and AUTHORS for Emacs 28.2 - ddabb03a01 * doc/misc/idlwave.texi (Troubleshooting): Don't say "Emac... + ddabb03a01 * doc/misc/idlwave.texi (Troubleshooting): Don't say "Emacs... 724444f3d5 ; * doc/emacs/misc.texi (emacsclient Options): Fix typo. b96257162d Don't mention very old Emacs versions in docs @@ -56282,7 +56282,7 @@ 2022-06-14 Mattias Engdegård - Simplify byte-compiler assuming cconv normalisations + Simplify byte-compiler assuming cconv normalizations * lisp/emacs-lisp/byte-opt.el (byte-optimize-form-code-walker) (byte-optimize-let-form, byte-optimize-letX): @@ -56296,7 +56296,7 @@ Make cconv work for dynamically bound code and always run it. This allows later stages to benefit from transformations and - normalisations in cconv. + normalizations in cconv. * lisp/emacs-lisp/bytecomp.el (byte-compile-preprocess): Always run cconv. @@ -104223,7 +104223,7 @@ Merge from origin/emacs-28 f1c9286 ; * doc/misc/org.org: fix capture context example - af67ce6 Merge branch 'emacs-28' of git.savannah.gnu.org:/srv/git/emac... + af67ce6 Merge branch 'emacs-28' of git.savannah.gnu.org:/srv/git/emacs... 610680a Fix rendering of title-less tags in shr 2ba4ccf ; * lisp/files.el (make-nearby-temp-file): Doc fix. diff --git a/admin/codespell/codespell.dictionary b/admin/codespell/codespell.dictionary index 59065fbf8e2..df6085feac8 100644 --- a/admin/codespell/codespell.dictionary +++ b/admin/codespell/codespell.dictionary @@ -1,6 +1,5 @@ alis->alist, alias, alas, axis, alms, boostrap-clean->bootstrap-clean -brunches->branches defalis->defalias defalises->defaliases ecmacs->emacs @@ -8,10 +7,6 @@ ehsell->eshell emcs->emacs file-writeable-p->file-writable-p finis->finish -firs->first -hep->help least-favourite->least-favorite -lien->line -liens->lines mecas->emacs sehell->eshell, shell, diff --git a/admin/codespell/codespell.exclude b/admin/codespell/codespell.exclude index 1f036478965..f01302b7931 100644 --- a/admin/codespell/codespell.exclude +++ b/admin/codespell/codespell.exclude @@ -1611,3 +1611,76 @@ Optional DETECTIN is an autoload cons from `ede-detect-directory-for-project' '("\\(?:Entering\\|Leavin\\(g\\)\\) directory [`']\\(.+\\)'$" (2 . 1)) "dropping" "fillin" "from" "granularity" "hppp" "inwindow" (".G1" . ".G2") ; grap + (let ((tagret nil) + (setq tagret (cons ans tagret)) + (setq tagret (append ans tagret))) + tagret)) + (setq tagret ans) + (setq tagret (car ans))) + (cons objret tagret))) + (prevend (track-changes--state-end state)) + (setq end prevend) + (when (< endb prevend) + (let ((new-end (+ end (- prevend endb)))) + (cl-assert (= prevend (+ beg lenbefore))) + (cl-assert (<= beg prevbeg prevend endb)) + (- endb prevend))) + (- endb prevend))))) + ;; etc... whereas "real" declmods are valid for all types, buildin + outin = ina | inb | \\=`constant; + out = outin; + comin comstart) + (setq comin (point)) + (buffer-substring comstart comin)))) + (comment-string-strip (buffer-substring comstart comin) nil t)) + (buffer-substring (point) comin)) + (buffer-substring (line-beginning-position) comin)))) +;; designate them are: eqn (e), grap (g), pic (p), tbl (t), vgrind + FLUSHO and PENDIN. + fo: { [x: any]: any } = { + "\\<\\(?:\\(?:fals\\|tru\\)e\\)\\>") + (search-forward "tru") + (search-forward "Tru") + (" fo.ba@example.com" 6 email "fo.ba@example.com") + "t" "tr" "tru" "truE" "truee" + "f" "fa" "fal" "fals" "falsE" "falsee")) + int eventState, notIn; + notIn = (down ? eventState & ~lastButtonState + if ((notIn & (MotionEvent.BUTTON_PRIMARY + if ((notIn & MotionEvent.BUTTON_PRIMARY) != 0) + if ((notIn & MotionEvent.BUTTON_SECONDARY) != 0) + if ((notIn & MotionEvent.BUTTON_TERTIARY) != 0) + if ((notIn & MotionEvent.BUTTON_BACK) != 0) + if ((notIn & MotionEvent.BUTTON_FORWARD) != 0) + if ((notIn & MotionEvent.BUTTON_STYLUS_PRIMARY) != 0) + if ((notIn & MotionEvent.BUTTON_STYLUS_SECONDARY) != 0) +argument \\='general-category, is Decimal_Numbers (Nd). It returns + (let (compos comin) + (setq comin (point)))))) + (setq comin (point)))) + (let* ((comstart (buffer-substring compos comin)) + (te (float-time + (dt (- (if tend (min te tend) te) +2022-04-20 Jean Abou Samra (tiny change) +(string< "abc" "abd") +(string< "abd" "abc") +;; ("a") ("ab") ("abc") ("abd") ("abf") ("zab") ("acb") +;; `«(my-face)U:abd»'. +;; `«(my-fibonacci-property):(1 1 2 3 5 8):abd»'. + :eval (string-collate-lessp "abc" "abd")) + :eval (string-lessp "abc" "abd") + :eval (string-greaterp "abd" "abc") + :eval (string-collate-lessp "abc" "abd"))) + `(("abc" < "abd") + (abc < "abd") + (abc < abd) + ("abc" < ,(string-to-multibyte "abd")) + (,(string-to-multibyte "abc") < "abd") + (,(string-to-multibyte "abc") < ,(string-to-multibyte "abd")) + ("" . "a") ("a" . "b") ("A" . "a") ("abc" . "abd") +2004-05-05 Stephen Eglen +;; location: http://www.anc.ed.ac.uk/~stephen/emacs/ + :link '(url-link "https://www.anc.ed.ac.uk/~stephen/emacs/") + ((or (string-equal tag "anc") (string-equal tag "ancestor")) + ("ro" :default "Continuare de pe pagina precedentă") + ("ro" :default "Continuare pe pagina următoare") diff --git a/admin/codespell/codespell.ignore b/admin/codespell/codespell.ignore index 4f6135ca39a..02bd6d05838 100644 --- a/admin/codespell/codespell.ignore +++ b/admin/codespell/codespell.ignore @@ -1,4 +1,5 @@ acknowledgements +advices afile ake analogue diff --git a/admin/make-manuals b/admin/make-manuals index 477daa09a4c..833849922e5 100755 --- a/admin/make-manuals +++ b/admin/make-manuals @@ -95,7 +95,7 @@ tempfile="$(emacs_mktemp)" if [ -e $outdir ]; then ## Speed up repeat invocation. - echo "Re-using existing $outdir/ directory" + echo "Reusing existing $outdir/ directory" else diff --git a/doc/lispref/help.texi b/doc/lispref/help.texi index 65ae5a33b3d..d1c22336c01 100644 --- a/doc/lispref/help.texi +++ b/doc/lispref/help.texi @@ -334,7 +334,7 @@ stands for a key sequence that will invoke @var{command}, or @samp{M-x @item \@{@var{mapvar}@} stands for a summary of the keymap which is the value of the variable @var{mapvar}. The summary is made using @code{describe-bindings}. -The summary will normally exclude meny bindings, but if the +The summary will normally exclude menu bindings, but if the @var{include-menus} argument to @code{substitute-command-keys} is non-@code{nil}, the menu bindings will be included. diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi index 56ebc589960..381da21cebe 100644 --- a/doc/misc/calc.texi +++ b/doc/misc/calc.texi @@ -18973,7 +18973,7 @@ number between zero and one. It is equivalent to @samp{random(1.0)}. @kindex k a @pindex calc-random-again The @kbd{k a} (@code{calc-random-again}) command produces another random -number, re-using the most recent value of @expr{M}. With a numeric +number, reusing the most recent value of @expr{M}. With a numeric prefix argument @var{n}, it produces @var{n} more random numbers using that value of @expr{M}. diff --git a/doc/misc/modus-themes.org b/doc/misc/modus-themes.org index 3e353dc356d..fb1df473f75 100644 --- a/doc/misc/modus-themes.org +++ b/doc/misc/modus-themes.org @@ -486,7 +486,7 @@ The reason we recommend ~load-theme~ instead of the other option of ~enable-theme~ is that the former does a kind of "reset" on the face specs. It quite literally loads (or reloads) the theme. Whereas the ~enable-theme~ function simply puts an already loaded theme to the top -of the list of enabled items, re-using whatever state was last loaded. +of the list of enabled items, reusing whatever state was last loaded. As such, ~load-theme~ reads all customizations that may happen during any given Emacs session: even after the initial setup of a theme. @@ -2821,7 +2821,7 @@ Reload the theme for changes to take effect. #+cindex: Remapping faces There are cases where we need to change the buffer-local attributes of a -face. This might be because we have our own minor mode that re-uses a +face. This might be because we have our own minor mode that reuses a face for a particular purpose, such as a line selection tool that activates ~hl-line-mode~, but we wish to keep it distinct from other buffers. This is where ~face-remap-add-relative~ can be applied and may diff --git a/doc/misc/org.org b/doc/misc/org.org index 5423cf59759..31431a6ffc9 100644 --- a/doc/misc/org.org +++ b/doc/misc/org.org @@ -16408,7 +16408,7 @@ The iCalendar format standard requires globally unique identifier---or UID---for each entry. The iCalendar export backend creates UIDs during export. To save a copy of the UID in the Org file set the variable ~org-icalendar-store-UID~. The backend looks for the =ID= -property of the entry for re-using the same UID for subsequent +property of the entry for reusing the same UID for subsequent exports. Since a single Org entry can result in multiple iCalendar diff --git a/java/Makefile.in b/java/Makefile.in index 8c72683d113..ed8779a2e45 100644 --- a/java/Makefile.in +++ b/java/Makefile.in @@ -260,8 +260,8 @@ install_temp: $(CROSS_BINS) $(CROSS_LIBS) $(RESOURCE_FILES) \ $(AM_V_SILENT) $(libsrc)/asset-directory-tool \ install_temp/assets install_temp/assets/directory-tree\ $(if $(ANDROID_SDK_8_OR_EARLIER),--api-8) -# If the package targets Android 2.2, move compressable and -# non-compressable assets to separate directories. +# If the package targets Android 2.2, move compressible and +# non-compressible assets to separate directories. $(AM_V_SILENT) \ if [ -z "${ANDROID_SDK_8_OR_EARLIER}" ]; then :; else \ echo "Moving large and gzipped files to separate directories...">&2;\ diff --git a/lisp/ChangeLog.6 b/lisp/ChangeLog.6 index 84253b2d079..80ca08fae2b 100644 --- a/lisp/ChangeLog.6 +++ b/lisp/ChangeLog.6 @@ -6276,7 +6276,7 @@ * vc.el (vc-dired-mode): Now a major mode derived from dired-mode. (vc-directory): Take DIRNAME as an argument. Ask for it in the minibuffer. Don't kill pre-existing vc-dired buffers - (dired now re-uses the right one). + (dired now reuses the right one). (vc-file-tree-walk): New argument DIRNAME. Updated all callers. (vc-dired-update): New function. `g' in vc-dired-mode calls it. (vc-dired-reformat-line): Handle different ls -l formats. diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el index 10c86571804..345687d1775 100644 --- a/lisp/calendar/calendar.el +++ b/lisp/calendar/calendar.el @@ -2497,7 +2497,7 @@ ATTRLIST is a list with elements of the form :face face :foreground color." (if (not faceinfo) ;; No attributes to apply, so just use an existing-face. face - ;; FIXME should we be using numbered temp-faces, re-using where poss? + ;; FIXME should we be using numbered temp-faces, reusing where poss? (setq temp-face (make-symbol (concat ":caltemp" diff --git a/lisp/erc/ChangeLog.1 b/lisp/erc/ChangeLog.1 index f1605f70f3e..d63f7aa20c6 100644 --- a/lisp/erc/ChangeLog.1 +++ b/lisp/erc/ChangeLog.1 @@ -2404,7 +2404,7 @@ documentation. (erc-cmd-QUIT): Set the active buffer to be the server buffer, so that any QUIT-related messages go there. - (erc): Try to be more clever about re-using channel buffers when + (erc): Try to be more clever about reusing channel buffers when automatically re-connecting. Thanks to e1f for noticing. 2006-01-23 Michael Olson diff --git a/lisp/external-completion.el b/lisp/external-completion.el index 7a25653700f..64a94b0ab31 100644 --- a/lisp/external-completion.el +++ b/lisp/external-completion.el @@ -126,7 +126,7 @@ EXPANDED-PATTERN." (pcase action (`metadata `(metadata (category . ,category) . ,metadata)) - ;; Note: the `--tryc' `--allc' suffixes are made akward on + ;; Note: the `--tryc' `--allc' suffixes are made awkward on ;; purpose, so it's easy to pick them apart from the jungle ;; of combinations of "try" and "all" and "completion" that ;; inhabit Emacs's completion logic. diff --git a/lisp/gnus/ChangeLog.2 b/lisp/gnus/ChangeLog.2 index 53f81862ddf..f8ce5630f26 100644 --- a/lisp/gnus/ChangeLog.2 +++ b/lisp/gnus/ChangeLog.2 @@ -18098,14 +18098,14 @@ 2000-11-05 Simon Josefsson * mml-smime.el (mml-smime-verify): Work in original multipart - buffert. + buffer. * mm-decode.el (mm-handle-multipart-original-buffer): New macro. (mm-handle-multipart-ctl-parameter): Ditto. (mm-alist-to-plist): New function. (mm-dissect-buffer): Store CTL parameters and copy original buffer for multiparts. - (mm-destroy-parts): Destroy multipart buffert. + (mm-destroy-parts): Destroy multipart buffer. (mm-remove-part): Ditto. * mml-smime.el (mml-smime-sign): Not used. diff --git a/lisp/jsonrpc.el b/lisp/jsonrpc.el index 9e9a5f97fd4..e6c2b9e05c0 100644 --- a/lisp/jsonrpc.el +++ b/lisp/jsonrpc.el @@ -448,7 +448,7 @@ ignored." ;; ...finally, whatever may have happened to this sync ;; request, it might have been holding up any outer ;; "anxious" continuations. The following ensures we - ;; cll them. + ;; call them. (jsonrpc--continue connection id))))) (when (eq 'error (car retval)) (signal 'jsonrpc-error diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el index fb723fb8878..7eb66bb062b 100644 --- a/lisp/net/ange-ftp.el +++ b/lisp/net/ange-ftp.el @@ -781,7 +781,7 @@ If nil, the value of `ange-ftp-netrc-default-user' is used. If that is nil too, then your login name is used. Once a connection to a given host has been initiated, the user name -and password information for that host are cached and re-used by +and password information for that host are cached and reused by ange-ftp. Use \\[ange-ftp-set-user] to change the cached values, since setting `ange-ftp-default-user' directly does not affect the cached information." diff --git a/lisp/org/ChangeLog.1 b/lisp/org/ChangeLog.1 index 74a62e00855..1cf159f19a2 100644 --- a/lisp/org/ChangeLog.1 +++ b/lisp/org/ChangeLog.1 @@ -9828,7 +9828,7 @@ to explicitly kill all agenda buffers. (org-agenda-run-series): Remove any old agenda markers in the buffer that is going to take the new block agenda. - (org-prepare-agenda): Reset markers before erasing the buffer anc + (org-prepare-agenda): Reset markers before erasing the buffer and running `org-agenda-mode', because after that the local variable `org-agenda-markers' will have gone away. (org-agenda-Quit): diff --git a/lisp/org/oc-basic.el b/lisp/org/oc-basic.el index 6e3142fa12b..e207a19977e 100644 --- a/lisp/org/oc-basic.el +++ b/lisp/org/oc-basic.el @@ -24,7 +24,7 @@ ;; The `basic' citation processor provides "activate", "follow", "export" and ;; "insert" capabilities. -;; "activate" capability re-uses default fontification, but provides additional +;; "activate" capability reuses default fontification, but provides additional ;; features on both correct and wrong keys according to the bibliography ;; defined in the document. diff --git a/lisp/org/org-faces.el b/lisp/org/org-faces.el index af7269bd15a..785fb22dbc0 100644 --- a/lisp/org/org-faces.el +++ b/lisp/org/org-faces.el @@ -683,7 +683,7 @@ month and 365.24 days for a year)." (defcustom org-n-level-faces (length org-level-faces) "The number of different faces to be used for headlines. Org mode defines 8 different headline faces, so this can be at most 8. -If it is less than 8, the level-1 face gets re-used for level N+1 etc." +If it is less than 8, the level-1 face gets reused for level N+1 etc." :type 'integer :group 'org-faces) diff --git a/lisp/org/ox.el b/lisp/org/ox.el index 35bbf84a0ca..6fa21be9063 100644 --- a/lisp/org/ox.el +++ b/lisp/org/ox.el @@ -4738,7 +4738,7 @@ matching DATUM before creating a new reference." ;; unique, e.g., there might be duplicate custom ID or ;; two headings with the same title in the file. ;; - ;; As a consequence, before re-using any reference to + ;; As a consequence, before reusing any reference to ;; an element or object, we check that it doesn't refer ;; to a previous element or object. (new (or (cl-some diff --git a/lisp/progmodes/bug-reference.el b/lisp/progmodes/bug-reference.el index 4a691e5bf67..88af92420b5 100644 --- a/lisp/progmodes/bug-reference.el +++ b/lisp/progmodes/bug-reference.el @@ -712,7 +712,7 @@ set already. This function sets the latter to nil buffer-locally, so that the auto-setup will always run. This is mostly intended for MUA modes like `rmail-mode' where the -same buffer is re-used for different contexts." +same buffer is reused for different contexts." (setq-local bug-reference-url-format nil) (bug-reference-mode)) diff --git a/lisp/progmodes/peg.el b/lisp/progmodes/peg.el index 938f8da910d..6dedb6e4895 100644 --- a/lisp/progmodes/peg.el +++ b/lisp/progmodes/peg.el @@ -311,7 +311,7 @@ EXPS is a list of rules/expressions that failed.") `(lambda ,args . ,body))) ;; Sometimes (with-peg-rules ... (peg-run (peg ...))) is too -;; longwinded for the task at hand, so `peg-parse' comes in handy. +;; long-winded for the task at hand, so `peg-parse' comes in handy. (defmacro peg-parse (&rest pexs) "Match PEXS at point. PEXS is a sequence of PEG expressions, implicitly combined with `and'. diff --git a/lisp/progmodes/php-ts-mode.el b/lisp/progmodes/php-ts-mode.el index 64138db9dc8..030b97c31b0 100644 --- a/lisp/progmodes/php-ts-mode.el +++ b/lisp/progmodes/php-ts-mode.el @@ -205,7 +205,7 @@ symbol." (defcustom php-ts-mode-indent-style 'psr2 "Style used for indentation. The selected style could be one of: -`PSR-2/PSR-12' - use PSR standards (PSR-2, PSR-12), thi is the default. +`PSR-2/PSR-12' - use PSR standards (PSR-2, PSR-12), this is the default. `PEAR' - use coding styles preferred for PEAR code and modules. `Drupal' - use coding styles preferred for working with Drupal projects. `WordPress' - use coding styles preferred for working with WordPress projects. @@ -242,7 +242,7 @@ Calls REPORT-FN directly." (kill-process php-ts-mode--flymake-process)) (let ((source (current-buffer)) (diagnostics-pattern (eval-when-compile - (rx bol (? "PHP ") ;; every dignostic line start with PHP + (rx bol (? "PHP ") ;; every diagnostic line start with PHP (group (or "Fatal" "Parse")) ;; 1: type " error:" (+ (syntax whitespace)) (group (+? nonl)) ;; 2: msg @@ -372,7 +372,7 @@ To set the default indent style globally, use `php-ts-mode' use five parsers, this function returns, for the current buffer, the ranges covered by each parser. -Usefull for debugging." +Useful for debugging." (let ((ranges) (parsers (treesit-parser-list nil nil t))) (if (not parsers) @@ -444,7 +444,7 @@ PARENT is its parent." (line-end-position)))))) (defun php-ts-mode--js-css-tag-bol (node _parent &rest _) - "Find the first non-space caracters of html tags