procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from savannah/emacs-30

Browse source 
4c35382e98 ; * src/emacs.c (syms_of_emacs) <Vsystem_type>: Fix doc s...
34882d5243 Port better to Android 3.0
765cfaed77 ; * doc/emacs/anti.texi (Antinews): Fix typos (bug#72167).
7093504da2 ; Fix typos (bug#72167)
8c7c4f4baa New Tramp tests
85d2d7982d Update Tramp manual
504bdd560a ; Fix last change
3ccebbe17b Fix 'toggle-window-dedicated' documentation
719d5753ca ; * doc/lispref/help.texi (Keys in Documentation): Add cr...
e3bba63ecb Checkdoc fixes in transient.el
This commit is contained in:
Po Lu 2024-07-18 13:36:46 +08:00
commit d31b202377
12 changed files with 35 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
doc/emacs/anti.texi
View file

@ -42,9 +42,9 @@ explicitly at configure time. This makes the default Emacs build
process much faster.
@item
JSON interfaces are slowly move into oblivion as past years come closer,
so we have removed our internal implementation of JSON; you will now
need to build Emacs with the libjansson library, if you need JSON.
JSON interfaces slowly move into oblivion as past years come closer, so
we have removed our internal implementation of JSON; you will now need
to build Emacs with the libjansson library, if you need JSON.
Eventually, we plan on removing JSON support from Emacs altogether; this
move will make the removal much simpler.
@ -52,7 +52,7 @@ move will make the removal much simpler.
Tree-sitter based modes are now completely independent of their
non-Tree-Sitter counterparts. We decided that keeping the settings
separate and independent goes a long way toward simplicity, which is one
of our main motivation for removing stuff from Emacs.
of our main motivations for removing stuff from Emacs.
@item
Various Help commands no longer turn on Outline minor mode. With less

8
doc/emacs/windows.texi
View file

@ -418,7 +418,7 @@ these commands are bound in the @kbd{C-x 5} prefix key.
@cindex dedicated window
Sometimes, a window is ``dedicated'' to its current buffer.
@xref{Dedicated Windows,, elisp, The Emacs Lisp Reference Manual}.
@xref{Dedicated Windows,,, elisp, The Emacs Lisp Reference Manual}.
@code{display-buffer} will avoid reusing dedicated windows most of the
time. This is indicated by a @samp{d} in the mode line (@pxref{Mode
Line}). A window can also be strongly dedicated, which prevents any
@ -434,9 +434,9 @@ you dedicate a window to that buffer, the command (through
@kindex C-x w d
@findex toggle-window-dedicated
Toggle whether the selected window is dedicated to the current
buffer. With a prefix argument, make the window strongly dedicated
instead.
You can use the command @kbd{C-x w d} (@code{toggle-window-dedicated})
to toggle whether the selected window is dedicated to the current
buffer. With a prefix argument, it makes the window strongly dedicated.
@menu
* Window Choice:: How @code{display-buffer} works.

2
doc/lispref/help.texi
View file

@ -375,7 +375,7 @@ as a link in the @file{*Help*} buffer.
@end table
@strong{Please note:} Each @samp{\} must be doubled when written in a
string in Emacs Lisp.
string in Emacs Lisp (@pxref{Syntax for Strings}).
@defun substitute-command-keys string &optional no-face include-menus
@vindex help-key-binding@r{ (face)}

3
doc/lispref/windows.texi
View file

@ -4447,9 +4447,12 @@ the value assigned by the last call of @code{set-window-dedicated-p} for
selected window.
@end defun
@findex toggle-window-dedicated
@defun set-window-dedicated-p window flag
This function marks @var{window} as dedicated to its buffer if
@var{flag} is non-@code{nil}, and non-dedicated otherwise.
Interactively you can use the @kbd{C-x w d}
(@code{toggle-window-dedicated}) command to do the same.
As a special case, if @var{flag} is @code{t}, @var{window} becomes
@dfn{strongly} dedicated to its buffer. @code{set-window-buffer}

5
doc/misc/tramp.texi
View file

@ -4580,6 +4580,11 @@ It does not report the remote terminal name via @code{process-tty-name}.
@item
It does not set process property @code{remote-pid}.
@item
It fails, when the command is too long. This can happen on
directories with a long directory name, or when the remote @env{PATH}
and/or other environment variables, which must be set, are too long.
@end itemize
In order to gain even more performance, it is recommended to bind

8
java/org/gnu/emacs/EmacsNoninteractive.java
View file

@ -120,11 +120,11 @@ public final class EmacsNoninteractive
}
/* Get a LoadedApk or ActivityThread.PackageInfo. How to do
this varies by Android version. On Android 2.3.3 and
earlier, there is no ``compatibilityInfo'' argument to
this varies by Android version. On Android 3.0 and earlier,
there is no ``compatibilityInfo'' argument to
getPackageInfo. */
if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.GINGERBREAD_MR1)
try
{
method
= activityThreadClass.getMethod ("getPackageInfo",
@ -134,7 +134,7 @@ public final class EmacsNoninteractive
(Context.CONTEXT_INCLUDE_CODE
| Context.CONTEXT_IGNORE_SECURITY));
}
else
catch (NoSuchMethodException exception)
{
compatibilityInfoClass
= Class.forName ("android.content.res.CompatibilityInfo");

2
lisp/minibuffer.el
View file

@ -2529,7 +2529,7 @@ any completion candidate highlighted in *Completions* window (to
indicate that it is the selected candidate) will be un-highlighted,
and point in the *Completions* window will be moved off such a candidate.
This means that `RET' (`minibuffer-choose-completion-or-exit') will exit
the minubuffer with the minibuffer's current contents, instead of the
the minibuffer with the minibuffer's current contents, instead of the
selected completion candidate."
:type '(choice (const :tag "Candidates in *Completions* stay selected as you type" nil)
(const :tag "Typing deselects any completion candidate in *Completions*" t))

2
lisp/progmodes/peg.el
View file

@ -274,7 +274,7 @@
"Actions collected along the current parse.
Used at runtime for backtracking. It's a list ((POS . THUNK)...).
Each THUNK is executed at the corresponding POS. Thunks are
executed in a postprocessing step, not during parsing.")
executed in a post-processing step, not during parsing.")
(defvar peg--errors nil
"Data keeping track of the rightmost parse failure location.

2
lisp/progmodes/php-ts-mode.el
View file

@ -209,7 +209,7 @@ symbol."
(when (derived-mode-p 'php-ts-mode)
(php-ts-mode-set-style val)))))
;; teken from c-ts-mode
;; taken from c-ts-mode
(defun php-ts-indent-style-safep (style)
"Non-nil if STYLE's value is safe for file-local variables."
(and (symbolp style) (not (functionp style))))

11
lisp/transient.el
View file

@ -4001,9 +4001,9 @@ and its value is returned to the caller."
set " ")))))
(cl-defmethod transient-format-description ((obj transient-group))
"Format the description by calling the next method. If the result
doesn't use the `face' property at all, then apply the face
`transient-heading' to the complete string."
"Format the description by calling the next method.
If the result doesn't use the `face' property at all, then apply the
face `transient-heading' to the complete string."
(and-let* ((desc (transient--get-description obj)))
(cond ((oref obj inapt)
(propertize desc 'face 'transient-inapt-suffix))
@ -4012,8 +4012,9 @@ doesn't use the `face' property at all, then apply the face
((propertize desc 'face 'transient-heading)))))
(cl-defmethod transient-format-description :around ((obj transient-suffix))
"Format the description by calling the next method. If the result
is nil, then use \"(BUG: no description)\" as the description.
"Format the description by calling the next method.
If the result is nil, then use \"(BUG: no description)\" as the
description.
If the OBJ's `key' is currently unreachable, then apply the face
`transient-unreachable' to the complete string."
(let ((desc (or (cl-call-next-method obj)

2
src/emacs.c
View file

@ -3590,7 +3590,7 @@ Special values:
`windows-nt' compiled as a native W32 application.
`cygwin' compiled using the Cygwin library.
`haiku' compiled for a Haiku system.
`android' compiled for Android.
`android' compiled for Android.
Anything else (in Emacs 26, the possibilities are: aix, berkeley-unix,
hpux, usg-unix-v) indicates some sort of Unix system. */);
Vsystem_type = intern_c_string (SYSTEM_TYPE);

4
test/lisp/net/tramp-tests.el
View file

@ -7623,6 +7623,8 @@ This requires restrictions of file name syntax."
(tramp--test-deftest-without-file-attributes tramp-test41-special-characters)
(tramp--test-deftest-direct-async-process tramp-test41-special-characters)
(ert-deftest tramp-test42-utf8 ()
"Check UTF8 encoding in file names and file contents."
(skip-unless (tramp--test-enabled))
@ -7691,6 +7693,8 @@ This requires restrictions of file name syntax."
(tramp--test-deftest-without-file-attributes tramp-test42-utf8)
(tramp--test-deftest-direct-async-process tramp-test42-utf8)
(ert-deftest tramp-test43-file-system-info ()
"Check that `file-system-info' returns proper values."
(skip-unless (tramp--test-enabled))