Commit a625ca5c authored by Glenn Morris's avatar Glenn Morris

Merge from origin/emacs-26

30c4f35a (origin/emacs-26) query-replace-regexp undo: Update next-repl...
c596be08 Amend the menu caption for page "Display Property" in the Eli...
13b95100 Add description of chinese-sisheng
parents 211dc01a 30c4f35a
Pipeline #3144 failed with stage
in 90 minutes and 1 second
......@@ -497,6 +497,10 @@ one of them selects that alternative. The keys @kbd{C-f}, @kbd{C-b},
do the highlighting in the buffer showing the possible characters,
rather than in the echo area.
To enter characters according to the @dfn{pīnyīn} transliteration
method instead, use the @code{chinese-sisheng} input method. This is
a composition based method, where e.g. @kbd{pi1} results in @samp{pī}.
In Japanese input methods, first you input a whole word using
phonetic spelling; then, after the word is in the buffer, Emacs
converts it into one or more characters using a large dictionary. One
......@@ -25,7 +25,7 @@ that Emacs presents to the user.
* Fringes:: Controlling window fringes.
* Scroll Bars:: Controlling scroll bars.
* Window Dividers:: Separating windows visually.
* Display Property:: Enabling special display features.
* Display Property:: Images, margins, text size, etc.
* Images:: Displaying images in Emacs buffers.
* Xwidgets:: Displaying native widgets in Emacs buffers.
* Buttons:: Adding clickable buttons to Emacs buffers.
......@@ -2698,7 +2698,7 @@ characters."
(num-replacements 0)
(nocasify t) ; Undo must preserve case (Bug#31073).
(while (and (< stack-idx stack-len)
(or (null replaced) last-was-act-and-show))
......@@ -2709,9 +2709,9 @@ characters."
;; Bind swapped values
;; (search-string <--> replacement)
search-string (nth (if replaced 4 3) elt)
next-replacement (nth (if replaced 3 4) elt)
last-replacement (nth (if replaced 3 4) elt)
search-string-replaced search-string
next-replacement-replaced next-replacement
last-replacement-replaced last-replacement
last-was-act-and-show nil)
(when (and (= stack-idx stack-len)
......@@ -2733,16 +2733,18 @@ characters."
(match-data t (nth 2 elt)))
next-replacement nocasify literal
last-replacement nocasify literal
noedit real-match-data backward)
replace-count (1- replace-count)
(goto-char (match-beginning 0))
(if regexp-flag
(looking-at next-replacement)
(looking-at (regexp-quote next-replacement)))
(looking-at last-replacement)
(looking-at (regexp-quote last-replacement)))
(match-data t (nth 2 elt))))
(when regexp-flag
(setq next-replacement (nth 4 elt)))
;; Set replaced nil to keep in loop
(when (eq def 'undo-all)
(setq replaced nil
......@@ -514,7 +514,9 @@ Return the last evalled form in BODY."
input "theorem \\([0-9]+\\)"
"theorem \\\\ref{theo_\\1}"
(format "theorem \\\\ref{theo_%d}" (1+ (string-to-number (match-string 1)))))
((?\s . (1 2)) (?U . (3)))
(string= input (buffer-string)))))
......@@ -530,4 +532,18 @@ Return the last evalled form in BODY."
(string= expected (buffer-string))))))
(ert-deftest query-replace-undo-bug37287 ()
"Test for ."
(let ((input "foo-1\nfoo-2\nfoo-3")
(expected "foo-2\nfoo-2\nfoo-3"))
input "\\([0-9]\\)"
(format "%d" (1+ (string-to-number (match-string 1)))))
((?\s . (1 2 4)) (?U . (3)))
(string= expected (buffer-string))))))
;;; replace-tests.el ends here
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment