Merge from origin/emacs-29
ae80192d97; * src/buffer.c (Fmake_indirect_buffer): Doc fix.2549eabc97Fix typos in vnvni.el.647cecc853; * lisp/vc/vc.el (vc-clone): Fix wording of doc string.383ccf6d51Avoid assertion violations in bidi.cb7cef701cb* lisp/files.el (hack-one-local-variable): Use `set-auto-...0530800175Fix infinite recursion in gdb-mi.el
This commit is contained in:
Eli Zaretskii
commit
170c655792
6 changed files with 53 additions and 41 deletions
|
|
@ -4352,10 +4352,8 @@ already the major mode."
|
|||
(pcase var
|
||||
('mode
|
||||
(let ((mode (intern (concat (downcase (symbol-name val))
|
||||
"-mode"))))
|
||||
(unless (eq (indirect-function mode)
|
||||
(indirect-function major-mode))
|
||||
(funcall mode))))
|
||||
"-mode"))))
|
||||
(set-auto-mode-0 mode t)))
|
||||
('eval
|
||||
(pcase val
|
||||
(`(add-hook ',hook . ,_) (hack-one-local-variable--obsolete hook)))
|
||||
|
|
|
|||
|
|
@ -125,8 +125,8 @@ and postfix: E66 -> E6, a55 -> a5, etc.
|
|||
("A61" ?Ấ) ; LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE
|
||||
("a62" ?ầ) ; LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE
|
||||
("A62" ?Ầ) ; LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE
|
||||
("a63" ?ẩ) ; LATIN SMALL LETTER A WITH CIRCUMFLEX AND HO6K ABOVE
|
||||
("A63" ?Ẩ) ; LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HO6K ABOVE
|
||||
("a63" ?ẩ) ; LATIN SMALL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
|
||||
("A63" ?Ẩ) ; LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
|
||||
("a64" ?ẫ) ; LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE
|
||||
("A64" ?Ẫ) ; LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE
|
||||
("a65" ?ậ) ; LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW
|
||||
|
|
@ -135,42 +135,42 @@ and postfix: E66 -> E6, a55 -> a5, etc.
|
|||
("A81" ?Ắ) ; LATIN CAPITAL LETTER A WITH BREVE AND ACUTE
|
||||
("a82" ?ằ) ; LATIN SMALL LETTER A WITH BREVE AND GRAVE
|
||||
("A82" ?Ằ) ; LATIN CAPITAL LETTER A WITH BREVE AND GRAVE
|
||||
("a83" ?ẳ) ; LATIN SMALL LETTER A WITH BREVE AND HO6K ABOVE
|
||||
("A83" ?Ẳ) ; LATIN CAPITAL LETTER A WITH BREVE AND HO6K ABOVE
|
||||
("a83" ?ẳ) ; LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE
|
||||
("A83" ?Ẳ) ; LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE
|
||||
("a84" ?ẵ) ; LATIN SMALL LETTER A WITH BREVE AND TILDE
|
||||
("A84" ?Ẵ) ; LATIN CAPITAL LETTER A WITH BREVE AND TILDE
|
||||
("a85" ?ặ) ; LATIN SMALL LETTER A WITH BREVE AND DOT BELOW
|
||||
("A85" ?Ặ) ; LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW
|
||||
("e5" ?ẹ) ; LATIN SMALL LETTER E WITH DOT BELOW
|
||||
("E5" ?Ẹ) ; LATIN CAPITAL LETTER E WITH DOT BELOW
|
||||
("e3" ?ẻ) ; LATIN SMALL LETTER E WITH HO6K ABOVE
|
||||
("E3" ?Ẻ) ; LATIN CAPITAL LETTER E WITH HO6K ABOVE
|
||||
("e3" ?ẻ) ; LATIN SMALL LETTER E WITH HOOK ABOVE
|
||||
("E3" ?Ẻ) ; LATIN CAPITAL LETTER E WITH HOOK ABOVE
|
||||
("e4" ?ẽ) ; LATIN SMALL LETTER E WITH TILDE
|
||||
("E4" ?Ẽ) ; LATIN CAPITAL LETTER E WITH TILDE
|
||||
("e61" ?ế) ; LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE
|
||||
("E61" ?Ế) ; LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE
|
||||
("e62" ?ề) ; LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE
|
||||
("E62" ?Ề) ; LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE
|
||||
("e63" ?ể) ; LATIN SMALL LETTER E WITH CIRCUMFLEX AND HO6K ABOVE
|
||||
("E63" ?Ể) ; LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HO6K ABOVE
|
||||
("e63" ?ể) ; LATIN SMALL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
|
||||
("E63" ?Ể) ; LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
|
||||
("e64" ?ễ) ; LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE
|
||||
("E64" ?Ễ) ; LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE
|
||||
("e65" ?ệ) ; LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW
|
||||
("E65" ?Ệ) ; LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW
|
||||
("i3" ?ỉ) ; LATIN SMALL LETTER I WITH HO6K ABOVE
|
||||
("I3" ?Ỉ) ; LATIN CAPITAL LETTER I WITH HO6K ABOVE
|
||||
("i3" ?ỉ) ; LATIN SMALL LETTER I WITH HOOK ABOVE
|
||||
("I3" ?Ỉ) ; LATIN CAPITAL LETTER I WITH HOOK ABOVE
|
||||
("i5" ?ị) ; LATIN SMALL LETTER I WITH DOT BELOW
|
||||
("I5" ?Ị) ; LATIN CAPITAL LETTER I WITH DOT BELOW
|
||||
("o5" ?ọ) ; LATIN SMALL LETTER O WITH DOT BELOW
|
||||
("O5" ?Ọ) ; LATIN CAPITAL LETTER O WITH DOT BELOW
|
||||
("o3" ?ỏ) ; LATIN SMALL LETTER O WITH HO6K ABOVE
|
||||
("O3" ?Ỏ) ; LATIN CAPITAL LETTER O WITH HO6K ABOVE
|
||||
("o3" ?ỏ) ; LATIN SMALL LETTER O WITH HOOK ABOVE
|
||||
("O3" ?Ỏ) ; LATIN CAPITAL LETTER O WITH HOOK ABOVE
|
||||
("o61" ?ố) ; LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE
|
||||
("O61" ?Ố) ; LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE
|
||||
("o62" ?ồ) ; LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE
|
||||
("O62" ?Ồ) ; LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE
|
||||
("o63" ?ổ) ; LATIN SMALL LETTER O WITH CIRCUMFLEX AND HO6K ABOVE
|
||||
("O63" ?Ổ) ; LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HO6K ABOVE
|
||||
("o63" ?ổ) ; LATIN SMALL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
|
||||
("O63" ?Ổ) ; LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
|
||||
("o64" ?ỗ) ; LATIN SMALL LETTER O WITH CIRCUMFLEX AND TILDE
|
||||
("O64" ?Ỗ) ; LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE
|
||||
("o65" ?ộ) ; LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELO7
|
||||
|
|
@ -179,22 +179,22 @@ and postfix: E66 -> E6, a55 -> a5, etc.
|
|||
("O71" ?Ớ) ; LATIN CAPITAL LETTER O WITH HORN AND ACUTE
|
||||
("o72" ?ờ) ; LATIN SMALL LETTER O WITH HORN AND GRAVE
|
||||
("O72" ?Ờ) ; LATIN CAPITAL LETTER O WITH HORN AND GRAVE
|
||||
("o73" ?ở) ; LATIN SMALL LETTER O WITH HORN AND HO6K ABOVE
|
||||
("O73" ?Ở) ; LATIN CAPITAL LETTER O WITH HORN AND HO6K ABOVE
|
||||
("o73" ?ở) ; LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE
|
||||
("O73" ?Ở) ; LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE
|
||||
("o74" ?ỡ) ; LATIN SMALL LETTER O WITH HORN AND TILDE
|
||||
("O74" ?Ỡ) ; LATIN CAPITAL LETTER O WITH HORN AND TILDE
|
||||
("o75" ?ợ) ; LATIN SMALL LETTER O WITH HORN AND DOT BELO7
|
||||
("O75" ?Ợ) ; LATIN CAPITAL LETTER O WITH HORN AND DOT BELO7
|
||||
("u5" ?ụ) ; LATIN SMALL LETTER U WITH DOT BELO7
|
||||
("U5" ?Ụ) ; LATIN CAPITAL LETTER U WITH DOT BELO7
|
||||
("u3" ?ủ) ; LATIN SMALL LETTER U WITH HO6K ABOVE
|
||||
("U3" ?Ủ) ; LATIN CAPITAL LETTER U WITH HO6K ABOVE
|
||||
("u3" ?ủ) ; LATIN SMALL LETTER U WITH HOOK ABOVE
|
||||
("U3" ?Ủ) ; LATIN CAPITAL LETTER U WITH HOOK ABOVE
|
||||
("u71" ?ứ) ; LATIN SMALL LETTER U WITH HORN AND ACUTE
|
||||
("U71" ?Ứ) ; LATIN CAPITAL LETTER U WITH HORN AND ACUTE
|
||||
("u72" ?ừ) ; LATIN SMALL LETTER U WITH HORN AND GRAVE
|
||||
("U72" ?Ừ) ; LATIN CAPITAL LETTER U WITH HORN AND GRAVE
|
||||
("u73" ?ử) ; LATIN SMALL LETTER U WITH HORN AND HO6K ABOVE
|
||||
("U73" ?Ử) ; LATIN CAPITAL LETTER U WITH HORN AND HO6K ABOVE
|
||||
("u73" ?ử) ; LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE
|
||||
("U73" ?Ử) ; LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE
|
||||
("u74" ?ữ) ; LATIN SMALL LETTER U WITH HORN AND TILDE
|
||||
("U74" ?Ữ) ; LATIN CAPITAL LETTER U WITH HORN AND TILDE
|
||||
("u75" ?ự) ; LATIN SMALL LETTER U WITH HORN AND DOT BELO7
|
||||
|
|
@ -203,20 +203,20 @@ and postfix: E66 -> E6, a55 -> a5, etc.
|
|||
("Y2" ?Ỳ) ; LATIN CAPITAL LETTER Y WITH GRAVE
|
||||
("y5" ?ỵ) ; LATIN SMALL LETTER Y WITH DOT BELO7
|
||||
("Y5" ?Ỵ) ; LATIN CAPITAL LETTER Y WITH DOT BELO7
|
||||
("y3" ?ỷ) ; LATIN SMALL LETTER Y WITH HO6K ABOVE
|
||||
("Y3" ?Ỷ) ; LATIN CAPITAL LETTER Y WITH HO6K ABOVE
|
||||
("y3" ?ỷ) ; LATIN SMALL LETTER Y WITH HOOK ABOVE
|
||||
("Y3" ?Ỷ) ; LATIN CAPITAL LETTER Y WITH HOOK ABOVE
|
||||
("y4" ?ỹ) ; LATIN SMALL LETTER Y WITH TILDE
|
||||
("Y4" ?Ỹ) ; LATIN CAPITAL LETTER Y WITH TILDE
|
||||
("d9" ?đ) ; LATIN SMALL LETTER D WITH STROKE
|
||||
("D9" ?Đ) ; LATIN CAPITAL LETTER D WITH STROKE
|
||||
;("$$" ?₫) ; U+20AB DONG SIGN (#### check)
|
||||
|
||||
("a22" ["a22"])
|
||||
("a22" ["a2"])
|
||||
("A22" ["A2"])
|
||||
("a11" ["a1"])
|
||||
("A11" ["A1"])
|
||||
("a66"' ["a6"])
|
||||
("A66"' ["A6"])
|
||||
("a66" ["a6"])
|
||||
("A66" ["A6"])
|
||||
("a44" ["a4"])
|
||||
("A44" ["A4"])
|
||||
("e22" ["e2"])
|
||||
|
|
@ -248,7 +248,7 @@ and postfix: E66 -> E6, a55 -> a5, etc.
|
|||
("i44" ["i4"])
|
||||
("I44" ["I4"])
|
||||
("u44" ["u4"])
|
||||
("U44" ["u4"])
|
||||
("U44" ["U4"])
|
||||
("o77" ["o7"])
|
||||
("O77" ["O7"])
|
||||
("u77" ["u7"])
|
||||
|
|
@ -283,7 +283,7 @@ and postfix: E66 -> E6, a55 -> a5, etc.
|
|||
("Y33" ["Y3"])
|
||||
("y44" ["y4"])
|
||||
("Y44" ["Y4"])
|
||||
("d9" ["d9"])
|
||||
("d99" ["d9"])
|
||||
("D99" ["D9"])
|
||||
;("$$$" ["$$"])
|
||||
|
||||
|
|
|
|||
|
|
@ -1880,7 +1880,8 @@ this trigger is subscribed to `gdb-buf-publisher' and called with
|
|||
|
||||
(defun gdb-clear-inferior-io ()
|
||||
(with-current-buffer (gdb-get-buffer-create 'gdb-inferior-io)
|
||||
(erase-buffer)))
|
||||
(let ((inhibit-read-only t))
|
||||
(erase-buffer))))
|
||||
|
||||
|
||||
(defconst breakpoint-xpm-data
|
||||
|
|
@ -2866,7 +2867,8 @@ current thread and update GDB buffers."
|
|||
|
||||
(defun gdb-clear-partial-output ()
|
||||
(with-current-buffer (gdb-get-buffer-create 'gdb-partial-output-buffer)
|
||||
(erase-buffer)))
|
||||
(let ((inhibit-read-only t))
|
||||
(erase-buffer))))
|
||||
|
||||
;; Parse GDB/MI result records: this process converts
|
||||
;; list [...] -> list
|
||||
|
|
|
|||
|
|
@ -3801,11 +3801,16 @@ to provide the `find-revision' operation instead."
|
|||
(vc-call-backend (vc-backend buffer-file-name) 'check-headers))
|
||||
|
||||
(defun vc-clone (remote &optional backend directory rev)
|
||||
"Use BACKEND to clone REMOTE into DIRECTORY.
|
||||
If successful, returns the string with the directory of the
|
||||
checkout. If BACKEND is nil, iterate through every known backend
|
||||
in `vc-handled-backends' until one succeeds. If REV is non-nil,
|
||||
it indicates a specific revision to check out."
|
||||
"Clone repository REMOTE using version-control BACKEND, into DIRECTORY.
|
||||
If successful, return the string with the directory of the checkout;
|
||||
otherwise return nil.
|
||||
REMOTE should be a string, the URL of the remote repository or the name
|
||||
of a directory (if the repository is local).
|
||||
If DIRECTORY is nil or omitted, it defaults to `default-directory'.
|
||||
If BACKEND is nil or omitted, the function iterates through every known
|
||||
backend in `vc-handled-backends' until one succeeds to clone REMOTE.
|
||||
If REV is non-nil, it indicates a specific revision to check out after
|
||||
cloning; the syntax of REV depends on what BACKEND accepts."
|
||||
(setq directory (expand-file-name (or directory default-directory)))
|
||||
(if backend
|
||||
(progn
|
||||
|
|
|
|||
|
|
@ -2908,7 +2908,6 @@ bidi_resolve_brackets (struct bidi_it *bidi_it)
|
|||
}
|
||||
else if (bidi_it->bracket_pairing_pos != eob)
|
||||
{
|
||||
eassert (bidi_it->resolved_level == -1);
|
||||
/* If the cached state shows an increase of embedding level due
|
||||
to an isolate initiator, we need to update the 1st cached
|
||||
state of the next run of the current isolating sequence with
|
||||
|
|
@ -2917,6 +2916,7 @@ bidi_resolve_brackets (struct bidi_it *bidi_it)
|
|||
if (bidi_it->level_stack[bidi_it->stack_idx].level > prev_level
|
||||
&& ISOLATE_STATUS (bidi_it, bidi_it->stack_idx))
|
||||
{
|
||||
eassert (bidi_it->resolved_level == -1);
|
||||
bidi_record_type_for_neutral (&prev_for_neutral, prev_level, 0);
|
||||
bidi_record_type_for_neutral (&next_for_neutral, prev_level, 1);
|
||||
}
|
||||
|
|
@ -2931,6 +2931,7 @@ bidi_resolve_brackets (struct bidi_it *bidi_it)
|
|||
}
|
||||
else if (bidi_it->bracket_pairing_pos == -1)
|
||||
{
|
||||
eassert (bidi_it->resolved_level == -1);
|
||||
/* Higher levels were not BPA-resolved yet, even if
|
||||
cached by bidi_find_bracket_pairs. Force application
|
||||
of BPA to the new level now. */
|
||||
|
|
|
|||
10
src/buffer.c
10
src/buffer.c
|
|
@ -796,14 +796,20 @@ DEFUN ("make-indirect-buffer", Fmake_indirect_buffer, Smake_indirect_buffer,
|
|||
BASE-BUFFER should be a live buffer, or the name of an existing buffer.
|
||||
|
||||
NAME should be a string which is not the name of an existing buffer.
|
||||
|
||||
Interactively, prompt for BASE-BUFFER (offering the current buffer as
|
||||
the default), and for NAME (offering as default the name of a recently
|
||||
used buffer).
|
||||
|
||||
Optional argument CLONE non-nil means preserve BASE-BUFFER's state,
|
||||
such as major and minor modes, in the indirect buffer.
|
||||
|
||||
CLONE nil means the indirect buffer's state is reset to default values.
|
||||
|
||||
If optional argument INHIBIT-BUFFER-HOOKS is non-nil, the new buffer
|
||||
does not run the hooks `kill-buffer-hook',
|
||||
`kill-buffer-query-functions', and `buffer-list-update-hook'. */)
|
||||
`kill-buffer-query-functions', and `buffer-list-update-hook'.
|
||||
|
||||
Interactively, CLONE and INHIBIT-BUFFER-HOOKS are nil. */)
|
||||
(Lisp_Object base_buffer, Lisp_Object name, Lisp_Object clone,
|
||||
Lisp_Object inhibit_buffer_hooks)
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue