mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into feature/android

Browse source
This commit is contained in:
Po Lu 2023-04-08 09:35:59 +08:00
commit e1261fff85
26 changed files with 588 additions and 635 deletions
Download patch file Download diff file Expand all files Collapse all files

27
lisp/textmodes/reftex-index.el
View file

@ -1445,20 +1445,19 @@ match, the user will be asked to confirm the replacement."
(as-words reftex-index-phrases-search-whole-words))
(unless macro-data
(error "No macro associated with key %c" char))
(unwind-protect
(let ((overlay-arrow-string "=>")
(overlay-arrow-position
reftex-index-phrases-marker)
(replace-count 0))
;; Show the overlay arrow
(move-marker reftex-index-phrases-marker
(match-beginning 0) (current-buffer))
;; Start the query-replace
(reftex-query-index-phrase-globally
files phrase macro-fmt
index-key repeat as-words)
(message "%s replaced"
(reftex-number replace-count "occurrence"))))))
(let ((overlay-arrow-string "=>")
(overlay-arrow-position
reftex-index-phrases-marker)
(replace-count 0))
;; Show the overlay arrow
(move-marker reftex-index-phrases-marker
(match-beginning 0) (current-buffer))
;; Start the query-replace
(reftex-query-index-phrase-globally
files phrase macro-fmt
index-key repeat as-words)
(message "%s replaced"
(reftex-number replace-count "occurrence")))))
(t (error "Cannot parse this line")))))
(defun reftex-index-all-phrases ()

4
lisp/textmodes/table.el
View file

@ -1935,8 +1935,8 @@ specific features."
(if (and cell table-detect-cell-alignment)
(table--detect-cell-alignment cell)))
(unless (re-search-forward border end t)
(goto-char end))))))))))
(restore-buffer-modified-p modified-flag)))
(goto-char end))))))
(restore-buffer-modified-p modified-flag)))))))
;;;###autoload
(defun table-unrecognize-region (beg end)