mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-11-21 06:55:35 +00:00
Backport commit 77d0eed74 from Emacs
; Fix typos 77d0eed74e1d934e28f364cb3adb06365e71335e Stefan Kangas Mon Jun 10 00:40:26 2024 +0200
This commit is contained in:
parent
2f184485bf
commit
2a6a0480d3
@ -137,7 +137,7 @@ This function is called by `org-babel-execute-src-block'."
|
|||||||
(let* ((cmdline (or (cdr (assq :cmdline params)) ""))
|
(let* ((cmdline (or (cdr (assq :cmdline params)) ""))
|
||||||
(batch/load (or (cdr (assq :batch params)) "batchload"))
|
(batch/load (or (cdr (assq :batch params)) "batchload"))
|
||||||
(cmdline (if (or (equal cmdline "") (equal batch/load "batchload"))
|
(cmdline (if (or (equal cmdline "") (equal batch/load "batchload"))
|
||||||
;; legacy behaviour:
|
;; legacy behavior:
|
||||||
;; ensure that --very-quiet is on command-line by default
|
;; ensure that --very-quiet is on command-line by default
|
||||||
(concat cmdline " " org-babel-maxima--command-arguments-default)
|
(concat cmdline " " org-babel-maxima--command-arguments-default)
|
||||||
;; if using an alternate loader, :cmdline overwrites default
|
;; if using an alternate loader, :cmdline overwrites default
|
||||||
|
@ -230,7 +230,7 @@ convert them into an Emacs-lisp table. Otherwise return the
|
|||||||
results as a string."
|
results as a string."
|
||||||
(let ((res (if (and (> (length results) 0)
|
(let ((res (if (and (> (length results) 0)
|
||||||
(string-equal "{" (substring results 0 1)))
|
(string-equal "{" (substring results 0 1)))
|
||||||
results ;don't covert dicts to elisp
|
results ;don't convert dicts to elisp
|
||||||
(org-babel-script-escape results))))
|
(org-babel-script-escape results))))
|
||||||
(if (listp res)
|
(if (listp res)
|
||||||
(mapcar (lambda (el) (if (eq el 'None)
|
(mapcar (lambda (el) (if (eq el 'None)
|
||||||
|
@ -369,7 +369,7 @@ another window."
|
|||||||
(const wl-other-frame)))))
|
(const wl-other-frame)))))
|
||||||
|
|
||||||
(defcustom org-link-search-must-match-exact-headline 'query-to-create
|
(defcustom org-link-search-must-match-exact-headline 'query-to-create
|
||||||
"Control fuzzy link behaviour when specific matches not found.
|
"Control fuzzy link behavior when specific matches not found.
|
||||||
|
|
||||||
When nil, if a fuzzy link does not match a more specific
|
When nil, if a fuzzy link does not match a more specific
|
||||||
target (such as a heading, named block, target, or code ref),
|
target (such as a heading, named block, target, or code ref),
|
||||||
@ -378,7 +378,7 @@ attempt a regular text search. When set to the special value
|
|||||||
link instead. Otherwise, signal an error rather than attempting
|
link instead. Otherwise, signal an error rather than attempting
|
||||||
a regular text search.
|
a regular text search.
|
||||||
|
|
||||||
This option only affects behaviour in Org buffers. Spaces and
|
This option only affects behavior in Org buffers. Spaces and
|
||||||
statistics cookies are ignored during heading searches."
|
statistics cookies are ignored during heading searches."
|
||||||
:group 'org-link-follow
|
:group 'org-link-follow
|
||||||
:version "24.1"
|
:version "24.1"
|
||||||
|
@ -530,7 +530,7 @@ DIR-property exists (that is different from the unset one)."
|
|||||||
"Turn the autotag on or (if OFF is set) off."
|
"Turn the autotag on or (if OFF is set) off."
|
||||||
(when org-attach-auto-tag
|
(when org-attach-auto-tag
|
||||||
;; FIXME: There is currently no way to set #+FILETAGS
|
;; FIXME: There is currently no way to set #+FILETAGS
|
||||||
;; programatically. Do nothing when before first heading
|
;; programmatically. Do nothing when before first heading
|
||||||
;; (attaching to file) to avoid blocking error.
|
;; (attaching to file) to avoid blocking error.
|
||||||
(unless (org-before-first-heading-p)
|
(unless (org-before-first-heading-p)
|
||||||
(save-excursion
|
(save-excursion
|
||||||
|
@ -633,7 +633,7 @@ With a numeric prefix, show all headlines up to that level."
|
|||||||
(org-cycle-content 5))
|
(org-cycle-content 5))
|
||||||
;; `nofold' and `showall' are technically not allowed values, but
|
;; `nofold' and `showall' are technically not allowed values, but
|
||||||
;; they are often intuitively tried by users by analogy with
|
;; they are often intuitively tried by users by analogy with
|
||||||
;; #+STARTUP: nofold or #STARUP: showall.
|
;; #+STARTUP: nofold or #STARTUP: showall.
|
||||||
((memq org-startup-folded '(showeverything nil nofold showall))
|
((memq org-startup-folded '(showeverything nil nofold showall))
|
||||||
(org-fold-show-all)))
|
(org-fold-show-all)))
|
||||||
(unless (eq org-startup-folded 'showeverything)
|
(unless (eq org-startup-folded 'showeverything)
|
||||||
|
@ -4489,7 +4489,7 @@ Assume point is at the beginning of the timestamp."
|
|||||||
(and (org-string-nw-p warning-string) (concat " " warning-string))
|
(and (org-string-nw-p warning-string) (concat " " warning-string))
|
||||||
(cdr brackets))))
|
(cdr brackets))))
|
||||||
(concat
|
(concat
|
||||||
;; Opening backet: [ or <
|
;; Opening bracket: [ or <
|
||||||
(car brackets)
|
(car brackets)
|
||||||
;; Starting date/time: YYYY-MM-DD DAY[ HH:MM]
|
;; Starting date/time: YYYY-MM-DD DAY[ HH:MM]
|
||||||
(if (eq type 'diary)
|
(if (eq type 'diary)
|
||||||
|
@ -148,7 +148,7 @@ random Automatically generate a unique, random label."
|
|||||||
(const :tag "Prompt for label" nil)
|
(const :tag "Prompt for label" nil)
|
||||||
(const :tag "Create automatic [fn:N]" t)
|
(const :tag "Create automatic [fn:N]" t)
|
||||||
(const :tag "Offer automatic [fn:N] for editing" confirm)
|
(const :tag "Offer automatic [fn:N] for editing" confirm)
|
||||||
(const :tag "Create anoymous [fn::]" anonymous)
|
(const :tag "Create anonymous [fn::]" anonymous)
|
||||||
(const :tag "Create a random label" random))
|
(const :tag "Create a random label" random))
|
||||||
:safe #'symbolp)
|
:safe #'symbolp)
|
||||||
|
|
||||||
|
@ -24,7 +24,7 @@
|
|||||||
|
|
||||||
;;; Commentary:
|
;;; Commentary:
|
||||||
|
|
||||||
;; This library implementes completion support in Org mode buffers.
|
;; This library implements completion support in Org mode buffers.
|
||||||
|
|
||||||
;;; Code:
|
;;; Code:
|
||||||
|
|
||||||
|
@ -452,7 +452,7 @@ FORMAT and ARGS are passed to `message'."
|
|||||||
"Write elisp DATA to FILE."
|
"Write elisp DATA to FILE."
|
||||||
;; Fsync slightly reduces the chance of an incomplete filesystem
|
;; Fsync slightly reduces the chance of an incomplete filesystem
|
||||||
;; write, however on modern hardware its effectiveness is
|
;; write, however on modern hardware its effectiveness is
|
||||||
;; questionable and it is insufficient to garantee complete writes.
|
;; questionable and it is insufficient to guarantee complete writes.
|
||||||
;; Coupled with the significant performance hit if writing many
|
;; Coupled with the significant performance hit if writing many
|
||||||
;; small files, it simply does not make sense to use fsync here,
|
;; small files, it simply does not make sense to use fsync here,
|
||||||
;; particularly as cache corruption is only a minor inconvenience.
|
;; particularly as cache corruption is only a minor inconvenience.
|
||||||
|
10
lisp/org.el
10
lisp/org.el
@ -8738,7 +8738,7 @@ there is one, return it."
|
|||||||
(save-window-excursion
|
(save-window-excursion
|
||||||
;; We have no direct control over how
|
;; We have no direct control over how
|
||||||
;; `with-output-to-temp-buffer' displays the buffer. Try
|
;; `with-output-to-temp-buffer' displays the buffer. Try
|
||||||
;; to gain more space, makign sure that only the Org
|
;; to gain more space, making sure that only the Org
|
||||||
;; buffer and the *Select link* buffer are displayed for
|
;; buffer and the *Select link* buffer are displayed for
|
||||||
;; the duration of selection.
|
;; the duration of selection.
|
||||||
(ignore-errors (delete-other-windows))
|
(ignore-errors (delete-other-windows))
|
||||||
@ -10041,7 +10041,7 @@ where CURRENT-TODO-KEYWORD belongs over on in another sequence."
|
|||||||
org-todo-key-alist))))
|
org-todo-key-alist))))
|
||||||
field-number ; current todo keyword column in the completion buffer.
|
field-number ; current todo keyword column in the completion buffer.
|
||||||
todo-binding-spec todo-keyword todo-char input-char)
|
todo-binding-spec todo-keyword todo-char input-char)
|
||||||
;; Display todo selection dialogue, read the user input, and return.
|
;; Display todo selection dialog, read the user input, and return.
|
||||||
(save-excursion
|
(save-excursion
|
||||||
(save-window-excursion
|
(save-window-excursion
|
||||||
;; Select todo keyword list buffer, and display it unless EXPERT-INTERFACE.
|
;; Select todo keyword list buffer, and display it unless EXPERT-INTERFACE.
|
||||||
@ -12224,7 +12224,7 @@ Returns the new tags string, or nil to not change the current settings."
|
|||||||
(move-overlay org-tags-overlay ov-start ov-end)
|
(move-overlay org-tags-overlay ov-start ov-end)
|
||||||
;; Highlight tags overlay in Org buffer.
|
;; Highlight tags overlay in Org buffer.
|
||||||
(org-set-current-tags-overlay current-tags ov-prefix)
|
(org-set-current-tags-overlay current-tags ov-prefix)
|
||||||
;; Display tag selection dialogue, read the user input, and return.
|
;; Display tag selection dialog, read the user input, and return.
|
||||||
(save-excursion
|
(save-excursion
|
||||||
(save-window-excursion
|
(save-window-excursion
|
||||||
;; Select tag list buffer, and display it unless EXPERT-INTERFACE.
|
;; Select tag list buffer, and display it unless EXPERT-INTERFACE.
|
||||||
@ -12239,7 +12239,7 @@ Returns the new tags string, or nil to not change the current settings."
|
|||||||
;; Insert current tags.
|
;; Insert current tags.
|
||||||
(org-fast-tag-insert "Inherited" inherited-tags inherited-face "\n")
|
(org-fast-tag-insert "Inherited" inherited-tags inherited-face "\n")
|
||||||
(org-fast-tag-insert "Current" current-tags current-face "\n\n")
|
(org-fast-tag-insert "Current" current-tags current-face "\n\n")
|
||||||
;; Display whether next change exits selection dialogue.
|
;; Display whether next change exits selection dialog.
|
||||||
(org-fast-tag-show-exit exit-after-next)
|
(org-fast-tag-show-exit exit-after-next)
|
||||||
;; Show tags, tag groups, and bindings in a grid.
|
;; Show tags, tag groups, and bindings in a grid.
|
||||||
;; Each tag in the grid occupies FIELD-WIDTH characters.
|
;; Each tag in the grid occupies FIELD-WIDTH characters.
|
||||||
@ -20965,7 +20965,7 @@ SEPARATOR is the string to insert after each link."
|
|||||||
"The method to use for dropped file.")
|
"The method to use for dropped file.")
|
||||||
(defun org--dnd-xds-function (need-name filename)
|
(defun org--dnd-xds-function (need-name filename)
|
||||||
"Handle file with FILENAME dropped via XDS protocol.
|
"Handle file with FILENAME dropped via XDS protocol.
|
||||||
When NEED-NAME is t, FILNAME is the base name of the file to be
|
When NEED-NAME is t, FILENAME is the base name of the file to be
|
||||||
saved.
|
saved.
|
||||||
When NEED-NAME is nil, the drop is complete."
|
When NEED-NAME is nil, the drop is complete."
|
||||||
(if need-name
|
(if need-name
|
||||||
|
@ -6254,7 +6254,7 @@ them."
|
|||||||
("no" :default "Illustrasjon")
|
("no" :default "Illustrasjon")
|
||||||
("nb" :default "Illustrasjon")
|
("nb" :default "Illustrasjon")
|
||||||
("nn" :default "Illustrasjon")
|
("nn" :default "Illustrasjon")
|
||||||
("pl" :default "Obrazek") ; alternativly "Rysunek"
|
("pl" :default "Obrazek") ; alternatively "Rysunek"
|
||||||
("pt_BR" :default "Figura")
|
("pt_BR" :default "Figura")
|
||||||
("ro" :default "Imaginea")
|
("ro" :default "Imaginea")
|
||||||
("ru" :html "Рисунок" :utf-8 "Рисунок")
|
("ru" :html "Рисунок" :utf-8 "Рисунок")
|
||||||
@ -6277,7 +6277,7 @@ them."
|
|||||||
("no" :default "Illustrasjon %d")
|
("no" :default "Illustrasjon %d")
|
||||||
("nb" :default "Illustrasjon %d")
|
("nb" :default "Illustrasjon %d")
|
||||||
("nn" :default "Illustrasjon %d")
|
("nn" :default "Illustrasjon %d")
|
||||||
("pl" :default "Obrazek %d") ; alternativly "Rysunek %d"
|
("pl" :default "Obrazek %d") ; alternatively "Rysunek %d"
|
||||||
("pt_BR" :default "Figura %d:")
|
("pt_BR" :default "Figura %d:")
|
||||||
("ro" :default "Imaginea %d:")
|
("ro" :default "Imaginea %d:")
|
||||||
("ru" :html "Рис. %d.:" :utf-8 "Рис. %d.:")
|
("ru" :html "Рис. %d.:" :utf-8 "Рис. %d.:")
|
||||||
@ -6438,7 +6438,7 @@ them."
|
|||||||
("nl" :default "Zie figuur %s"
|
("nl" :default "Zie figuur %s"
|
||||||
:html "Zie figuur %s" :latex "Zie figuur~%s")
|
:html "Zie figuur %s" :latex "Zie figuur~%s")
|
||||||
("nn" :default "Sjå figur %s")
|
("nn" :default "Sjå figur %s")
|
||||||
("pl" :default "Patrz obrazek %s") ; alternativly "Patrz rysunek %s"
|
("pl" :default "Patrz obrazek %s") ; alternatively "Patrz rysunek %s"
|
||||||
("pt_BR" :default "Veja a figura %s")
|
("pt_BR" :default "Veja a figura %s")
|
||||||
("ro" :default "Vezi figura %s")
|
("ro" :default "Vezi figura %s")
|
||||||
("sl" :default "Glej sliko %s")
|
("sl" :default "Glej sliko %s")
|
||||||
|
Loading…
Reference in New Issue
Block a user