1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-07 16:10:46 -08:00

Merge from origin/emacs-28

c8442df ; Separate command and concept index in Transient manual
8aa052c ; Fix Transient manual
5b7752a Fix problem with popd for in remote shell buffers
38f6ea1 Import texi source file for transient manual
df34929 Update to Org 9.5.2-15-gc5ceb6
This commit is contained in:
Eli Zaretskii 2022-02-18 10:38:47 +02:00
commit 2ed240296c
6 changed files with 2569 additions and 7 deletions

View file

@ -73,8 +73,8 @@ INFO_COMMON = auth autotype bovine calc ccmode cl \
flymake forms gnus emacs-gnutls htmlfontify idlwave ido info.info \
mairix-el message mh-e modus-themes newsticker nxml-mode octave-mode \
org pcl-cvs pgg rcirc remember reftex sasl \
sc semantic ses sieve smtpmail speedbar srecode todo-mode tramp \
url vhdl-mode vip viper widget wisent woman
sc semantic ses sieve smtpmail speedbar srecode todo-mode transient \
tramp url vhdl-mode vip viper widget wisent woman
## Info files to install on current platform.
INFO_INSTALL = $(INFO_COMMON) $(DOCMISC_W32)

2560
doc/misc/transient.texi Normal file

File diff suppressed because it is too large Load diff

View file

@ -655,7 +655,8 @@ With a prefix arg, query for optional fields."
(defun org-bibtex-read ()
"Read a bibtex entry and save to `org-bibtex-entries'.
This uses `bibtex-parse-entry'."
This uses `bibtex-parse-entry'.
Return the new value of `org-bibtex-entries'."
(interactive)
(let ((keyword (lambda (str) (intern (concat ":" (downcase str)))))
(clean-space (lambda (str) (replace-regexp-in-string
@ -678,7 +679,8 @@ This uses `bibtex-parse-entry'."
(funcall clean-space (funcall strip-delim (cdr pair)))))
(save-excursion (bibtex-beginning-of-entry) (bibtex-parse-entry)))
org-bibtex-entries)
(unless (car org-bibtex-entries) (pop org-bibtex-entries))))
(unless (car org-bibtex-entries) (pop org-bibtex-entries))
org-bibtex-entries))
(defun org-bibtex-read-buffer (buffer)
"Read all bibtex entries in BUFFER and save to `org-bibtex-entries'.

View file

@ -1442,7 +1442,7 @@ This function returns, destructively, the new list structure."
(save-excursion
(goto-char (org-list-get-last-item item struct prevs))
(point-at-eol)))
((string-match-p "\\`[0-9]+\\'" dest)
((and (stringp dest) (string-match-p "\\`[0-9]+\\'" dest))
(let* ((all (org-list-get-all-items item struct prevs))
(len (length all))
(index (mod (string-to-number dest) len)))

View file

@ -11,7 +11,7 @@ Inserted by installing Org mode or when a release is made."
(defun org-git-version ()
"The Git version of Org mode.
Inserted by installing Org or when a release is made."
(let ((org-git-version "release_9.5.2-13-gdd6486"))
(let ((org-git-version "release_9.5.2-15-gc5ceb6"))
org-git-version))
(provide 'org-version)

View file

@ -942,7 +942,7 @@ Environment variables are expanded, see function `substitute-in-file-name'."
dir
(if (file-name-absolute-p dir)
;; The name is absolute, so prepend the prefix.
(concat comint-file-name-prefix dir)
(concat comint-file-name-prefix (file-local-name dir))
;; For relative name we assume default-directory already has the prefix.
(expand-file-name dir))))