aboutsummaryrefslogtreecommitdiffstats
path: root/doc/misc/eshell.texi
diff options
context:
space:
mode:
authorEli Zaretskii2025-01-25 10:06:19 -0500
committerEli Zaretskii2025-01-25 10:06:19 -0500
commit6016967e858e12f07c3cf4ade35cddef7b91a0d4 (patch)
treeeafea5f10d6432b3de53dab534604193cafe98e8 /doc/misc/eshell.texi
parente8f173f0ba9327033781429ea9a1d99ff8d2f751 (diff)
parent67903f5909db5c6140eeffebfaf818b4f93625d5 (diff)
downloademacs-6016967e858e12f07c3cf4ade35cddef7b91a0d4.tar.gz
emacs-6016967e858e12f07c3cf4ade35cddef7b91a0d4.zip
Merge from origin/emacs-30
67903f5909d Restore the old behavior of `bookmark-write-file' 062da7003f9 ; Improve prompts and error messages in 'info-look' 52dc01f1c8b ; * admin/admin.el (set-version): Note about Android. fb282da2a07 Avoid double spaces around abbrevations in Texinfo bc1ab8ac3d8 ; * doc/emacs/custom.texi (Init Rebinding): Fix spacing. b41ef43af19 ; Fix previous change 5638b1d6bd4 Ispell: Use "personal dictionary" terminology consistently cc791e7499f ; Check man pages for mistakes less frequently 4ed4792e3b9 ; * admin/release-process: Minor copy-edits. 4a867c823b7 Add language server "ruff server" for Python 9e687c2871f Fix go-ts-mode type declaration indentation (Bug#75785) f751b3afa4f ; Minor improvements for doc strings in map.el cda78edc7d9 ; Fix typos ce50a1d3c18 ; * src/w32.c (w32_memory_info): Fix coding style of last... 58d3d4820ad Fix bug in w32_memory_info 77386412050 Avoid crashes in redisplay due to problematic font setups 0e3687e6006 Improve 'key-valid-p' docstring 9878092d2b9 Minor copyedits in internals.texi 4726900fdc5 Better document side-effect free and pure C functions 04c475a39f2 ; Fix documentation about faces of tool-tip text # Conflicts: # admin/codespell/codespell.exclude
Diffstat (limited to 'doc/misc/eshell.texi')
-rw-r--r--doc/misc/eshell.texi6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/misc/eshell.texi b/doc/misc/eshell.texi
index 6f70b270c5a..465d3dede13 100644
--- a/doc/misc/eshell.texi
+++ b/doc/misc/eshell.texi
@@ -1642,7 +1642,7 @@ edited aliases.
1642 1642
1643Note that unlike aliases in Bash, arguments must be handled 1643Note that unlike aliases in Bash, arguments must be handled
1644explicitly. Within aliases, you can use the special variables 1644explicitly. Within aliases, you can use the special variables
1645@samp{$*}, @samp{$0}, @samp{$1}, @samp{$2}, etc. to refer to the 1645@samp{$*}, @samp{$0}, @samp{$1}, @samp{$2}, etc.@: to refer to the
1646arguments passed to the alias. 1646arguments passed to the alias.
1647 1647
1648@table @code 1648@table @code
@@ -2600,8 +2600,8 @@ glob patterns, the pattern will be removed from the input line, and
2600replaced by the completion. 2600replaced by the completion.
2601 2601
2602@kindex M-? 2602@kindex M-?
2603If you want to see the entire list of possible completions (e.g. when it's 2603If you want to see the entire list of possible completions (e.g., when
2604below the @code{completion-cycle-threshold}), press @kbd{M-?}. 2604it's below the @code{completion-cycle-threshold}), press @kbd{M-?}.
2605 2605
2606@subsection pcomplete 2606@subsection pcomplete
2607Pcomplete, short for programmable completion, is the completion 2607Pcomplete, short for programmable completion, is the completion