summaryrefslogtreecommitdiff
path: root/lisp/org
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/org')
-rw-r--r--lisp/org/ChangeLog.178
-rw-r--r--lisp/org/ob-coq.el2
-rw-r--r--lisp/org/ob-core.el5
-rw-r--r--lisp/org/ob-fortran.el2
-rw-r--r--lisp/org/ob-js.el6
-rw-r--r--lisp/org/ob-plantuml.el2
-rw-r--r--lisp/org/ob-ruby.el16
-rw-r--r--lisp/org/ob-sass.el2
-rw-r--r--lisp/org/ob-screen.el2
-rw-r--r--lisp/org/ob-stan.el2
-rw-r--r--lisp/org/ob-vala.el2
-rw-r--r--lisp/org/ol-gnus.el6
-rw-r--r--lisp/org/ol.el4
-rw-r--r--lisp/org/org-agenda.el10
-rw-r--r--lisp/org/org-capture.el2
-rw-r--r--lisp/org/org-element.el6
-rw-r--r--lisp/org/org-protocol.el2
-rw-r--r--lisp/org/org-table.el10
-rw-r--r--lisp/org/org-tempo.el2
-rw-r--r--lisp/org/org.el15
-rw-r--r--lisp/org/ox-latex.el2
-rw-r--r--lisp/org/ox-odt.el10
-rw-r--r--lisp/org/ox.el4
23 files changed, 98 insertions, 94 deletions
diff --git a/lisp/org/ChangeLog.1 b/lisp/org/ChangeLog.1
index 65d60bee11d..ef62ae7356c 100644
--- a/lisp/org/ChangeLog.1
+++ b/lisp/org/ChangeLog.1
@@ -1615,7 +1615,7 @@
(org-babel-load-in-session-maybe, org-babel-pop-to-session-maybe):
Use it.
(org-babel-execute-src-block): Use `copy-tree' to prevent setf
- from modifying users variables withing let-bound `info' variable.
+ from modifying users variables within let-bound `info' variable.
* ob-exp.el (org-export-babel-evaluate): Add a 'inline-only
option.
@@ -1821,7 +1821,7 @@
it is an ARRAY ref, otherwise print it without a final newline.
(org-babel-perl-preface): Content of this variable is prepended to
body before invocation of perl. Rename input parameter body to
- ibody and let-bind body to concatentation of
+ ibody and let-bind body to concatenation of
`org-babel-perl-preface' and ibody. Implement results
interpretation so that tables are easier to produce.
@@ -3142,7 +3142,7 @@
relatively to the current timestamp, not to today's date.
* org-agenda.el (org-agenda-filter-apply):
- Deactive `org-agenda-entry-text-mode' when filtering.
+ Deactivate `org-agenda-entry-text-mode' when filtering.
(org-agenda-entry-text-mode): Don't allow in filtered views.
Don't show the maximum number of lines when turning off.
@@ -3439,7 +3439,7 @@
(org-edit-src-exit): Cancel the timer.
(org-edit-src-save): Prevent saving when editing fixed-width
buffer, exiting will save already.
- (org-edit-src-exit): Inconditionally kill the src/example
+ (org-edit-src-exit): Unconditionally kill the src/example
editing buffer.
* org-pcomplete.el (pcomplete/org-mode/file-option):
@@ -3490,7 +3490,7 @@
* org-pcomplete.el (pcomplete/org-mode/file-option/x):
Resurrect. Use `org-default-options' to initialize completion
- fonctions for the most important keywords.
+ functions for the most important keywords.
* org-macs.el (org-default-options): Rename and adapt from
`org-get-current-options'.
@@ -3588,7 +3588,7 @@
new sorting strategies.
(org-agenda-get-todos, org-agenda-get-timestamps)
(org-agenda-get-deadlines, org-agenda-get-scheduled): Add a
- `ts-date' text property with scheduled, deadline or timetamp
+ `ts-date' text property with scheduled, deadline or timestamp
date.
(org-cmp-ts): New function to compare timestamps.
(org-em): Add a docstring.
@@ -4800,7 +4800,7 @@
(org-element-timestamp-interpreter): Parse warning delays.
* ox-beamer.el (org-beamer--format-section): Fix regression which
- prevents frames from being propely exported.
+ prevents frames from being properly exported.
* ox.el (org-export-with-backend): Ensure function will use
provided back-end.
@@ -4888,7 +4888,7 @@
which is always nil in this back-end.
* org.el (org-adaptive-fill-function): Look for a fill prefix at
- the beginning of the paragraph and subsquently on its second line
+ the beginning of the paragraph and subsequently on its second line
instead of the current line.
* ob-core.el (org-babel-get-src-block-info): Look for indentation
@@ -5595,7 +5595,7 @@
(org-export-async-start): Do not call `org-mode' since this is done
already in the previous function.
- * ox-beamer.el (org-beamer-keyword): Remove frame arount toc when
+ * ox-beamer.el (org-beamer-keyword): Remove frame around toc when
generated from a TOC keyword.
* org.el (org-export-backends): Do not reset list of loaded
@@ -5629,7 +5629,7 @@
during a body-only export.
* ox.el (org-export-as): Store export options in :export-options
- porperty within communication channel.
+ property within communication channel.
* ox-latex.el (org-latex-item): Fix wrong behavior when a counter
is set in an ordered list while its parent is not ordered.
@@ -5714,7 +5714,7 @@
(org-create-formula-image-with-dvipng)
(org-create-formula-image-with-imagemagick): Use new function.
- * ox.el (org-export-get-previous-element): Change order of retured
+ * ox.el (org-export-get-previous-element): Change order of returned
elements in `org-export-get-previous-element'.
* org-element.el (org-element-all-successors): Add `plain-link'
@@ -5839,10 +5839,10 @@
Remove reference to now renamed `e-ascii' back-end.
* ox-beamer.el (org-beamer-template): Allow to span documentclass
- options accross multiple lines in template.
+ options across multiple lines in template.
* ox-latex.el (org-latex-template): Allow to span documentclass
- options accross multiple lines in template.
+ options across multiple lines in template.
* ox-texinfo.el (org-texinfo--get-node): Upcase property name.
(org-texinfo--get-node): New function.
@@ -6524,7 +6524,7 @@
* org.el (org-open-at-point): The new code is being run in the
same spot as `org-open-link-functions'. In case they failed,
check if link matches "^id:" and if so, load the id interface and
- follwo the link.
+ follow the link.
2013-11-12 Rasmus Pank Roulund <rasmus@gmx.us> (tiny change)
@@ -6717,7 +6717,7 @@
2013-11-12 Vitalie Spinu <spinuvit@gmail.com>
* ob-tangle.el (org-babel-find-file-noselect-refresh):
- Call `find-file-noselect' with 'nowarn argument to surpress
+ Call `find-file-noselect' with 'nowarn argument to suppress
`yes-or-no-p' reversion message.
* ob-core.el (org-babel-where-is-src-block-head):
@@ -6990,7 +6990,7 @@
docstrings. Also fix typos.
* org-list.el (org-list-struct-fix-box): When a checkbox has to be
- resetted because of a non-nil ORDERED property value, make sure it
+ reset because of a non-nil ORDERED property value, make sure it
had a checkbox already.
2013-02-07 Tokuya Kameshima <kametoku@gmail.com> (tiny change)
@@ -9533,7 +9533,7 @@
* org-latex.el (org-export-latex-make-header): Ditto.
* org-clock.el (org-clocktable-write-default): Temporarily disable
- `delete-active-region' so that we don't accidently delete an
+ `delete-active-region' so that we don't accidentally delete an
active region when exporting a subtree/region.
* org-clock.el (org-program-exists): Remove.
@@ -10419,7 +10419,7 @@
space character when auto-filling.
* org.el (org-mode): Call external initalizers. Now both filling
- code and comments code have their own independant part in org.el.
+ code and comments code have their own independent part in org.el.
(org-setup-filling): Rename from `org-set-autofill-regexps'.
(org-setup-comments-handling): New function.
@@ -10652,7 +10652,7 @@
(org-list-struct-apply-struct, org-insert-item): Remove rule
check.
- * org-footnote.el (org-footnote-normalize): Fix positionning in
+ * org-footnote.el (org-footnote-normalize): Fix positioning in
HTML export without a footnote section.
* org-list.el (org-list-struct-indent):
@@ -11318,7 +11318,7 @@
2012-04-01 Shaun Johnson <shaun@slugfest.demon.co.uk> (tiny change)
* org-exp-blocks.el (org-ditaa-jar-path): Better heuristic to find
- the libary name.
+ the library name.
2012-04-01 Suvayu Ali <fatkasuvayu+linux@gmail.com>
@@ -11917,7 +11917,7 @@
2012-04-01 Nicolas Goaziou <n.goaziou@gmail.com>
* org-footnote.el (org-footnote-at-definition-p): Make sure to
- move point at the beginning of the separator before skiping white
+ move point at the beginning of the separator before skipping white
spaces. Refactor code.
2012-04-01 Eric Schulte <eric.schulte@gmx.com>
@@ -13692,7 +13692,7 @@
2012-01-03 Carsten Dominik <carsten.dominik@gmail.com>
* org-publish.el (org-publish-cache-file-needs-publishing):
- Fix regexp to not inlcude newlines.
+ Fix regexp to not include newlines.
2012-01-03 Carsten Dominik <carsten.dominik@gmail.com>
@@ -14560,7 +14560,7 @@
2012-01-03 Nicolas Goaziou <n.goaziou@gmail.com>
* org-footnote.el (org-footnote-normalize): Effectively remove
- any footnote tag in non Org buffers, as detailled in the
+ any footnote tag in non Org buffers, as detailed in the
docstring of `org-footnote-tag-for-non-org-mode-files'.
2012-01-03 Nicolas Goaziou <n.goaziou@gmail.com>
@@ -15622,7 +15622,7 @@
2011-07-28 David Maus <dmaus@ictsoc.de>
* ob-haskell.el (org-babel-haskell-export-to-lhs):
- Call `kill-buffer' with argument indiciating to kill current
+ Call `kill-buffer' with argument indicating to kill current
buffer. Emacs 22 compatibility.
2011-07-28 David Maus <dmaus@ictsoc.de>
@@ -18049,7 +18049,7 @@
* org-table.el (org-table-fedit-finish): Read more general LHS of
formulas.
- (org-table-formula-handle-@L): New function to hanle @L references.
+ (org-table-formula-handle-@L): New function to handle @L references.
(org-table-current-ncol): New variable.
(org-table-line-to-dline): New function.
(org-table-get-stored-formulas): Accept range formulas as matches.
@@ -18058,7 +18058,7 @@
only the region marked by the range, not the content.
(org-table-recalculate): Call `org-table-expand-lhs-ranges' to expand
range targets. Also check for duplicate access to fields.
- (org-table-expand-lhs-ranges): New funktion.
+ (org-table-expand-lhs-ranges): New function.
(org-table-get-remote-range): Bind `org-table-current-ncol' to protect
the caller's value.
(org-table-edit-formulas): Support highlighting of range targets.
@@ -19339,8 +19339,8 @@
* org-crypt.el (org-encrypt-string): New function.
(org-encrypt-entry): Use org-encrypt-string to encrypt, so we use
- cached crypted values.
- (org-decrypt-entry): Store crypted text in decrypted text.
+ cached encrypted values.
+ (org-decrypt-entry): Store encrypted text in decrypted text.
2011-07-28 Dan Davison <dandavison7@gmail.com>
@@ -20331,7 +20331,7 @@
2010-12-11 Carsten Dominik <carsten.dominik@gmail.com>
* org-clock.el (org-quarter-to-date): Define variables.
- (org-clock-special-range): Defin variables. Use org-floor*.
+ (org-clock-special-range): Define variables. Use org-floor*.
(org-clocktable-write-default): Define tcol.
* org-compat.el (org-floor*): New function.
@@ -22854,7 +22854,7 @@
2010-11-11 Nicolas Goaziou <n.goaziou@gmail.com>
* org-list.el (org-cycle-item-indentation): Do return t if and
- only if cycling is possible and succeded.
+ only if cycling is possible and succeeded.
2010-11-11 Nicolas Goaziou <n.goaziou@gmail.com>
@@ -28181,7 +28181,7 @@
* org-src.el (org-src-lang-modes): New variable.
(org-edit-src-code): Translate language.
- * org-exp.el (org-export-format-source-code-or-example): Deal wit
+ * org-exp.el (org-export-format-source-code-or-example): Deal with
the new structure of the `org-export-latex-listings-langs'
variable.
@@ -28529,7 +28529,7 @@
* org.el (org-adapt-indentation): Slightly improve the docstring.
(org-occur): Sends an error when the user inputs an empty string.
- (org-priority): Bugfix: the tag alignement should happen within
+ (org-priority): Bugfix: the tag alignment should happen within
save-excursion.
2009-08-06 Bastien Guerry <bzg@gnu.org>
@@ -28830,7 +28830,7 @@
* org-agenda.el (org-agenda-mode): Reset list of marks.
(org-agenda-mode-map): Define new keys for refile and bulk action.
- (org-agenda-menu): Add menu itesm for refile and bulk action.
+ (org-agenda-menu): Add menu items for refile and bulk action.
(org-agenda-refile): New function.
(org-agenda-set-tags): Optional arguments TAG and ONOFF.
(org-agenda-marked-entries): New variable.
@@ -29490,7 +29490,7 @@
New functions.
(org-protocol-check-filename-for-protocol): Call `server-edit'.
- * org.el (org-default-properties): New default properteis for
+ * org.el (org-default-properties): New default properties for
completion.
* org-exp.el (org-export-add-subtree-options): Add new properties
@@ -29842,7 +29842,7 @@
* org-faces.el (org-checkbox): New face.
* org-exp.el (org-export-html-preprocess): Only create LaTeX
- fragement images if there is an export file.
+ fragment images if there is an export file.
2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>
@@ -30465,7 +30465,7 @@
workings of `org-toggle-heading'.
(org-toggle-item): Rename from `org-toggle-region-items'.
No longer needs a region defined, but will use it if there is one.
- (org-ctrl-c-minus): Simplify, relying more on the inernal
+ (org-ctrl-c-minus): Simplify, relying more on the internal
workings of `org-toggle-item'.
* org-export-latex.el (org-export-latex-preprocess): Fix bug in
@@ -30674,7 +30674,7 @@
converter.
* org-exp.el (org-export-preprocess-string): Remove clock lines
- and timestamps already in the preprocesor.
+ and timestamps already in the preprocessor.
(org-export-remove-timestamps, org-export-remove-clock-lines):
New functions.
(org-export-as-ascii, org-export-as-html): Add the timestamps
@@ -31158,14 +31158,14 @@
2008-11-24 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-get-closed): Re-apply changes
- accidentially overwritten by last commit to Emacs.
+ accidentally overwritten by last commit to Emacs.
* org.el (org-outline-path-complete-in-steps): New option.
(org-refile-get-location):
Honor `org-outline-path-complete-in-steps'.
(org-agenda-change-all-lines, org-tags-sparse-tree)
(org-time-string-to-absolute, org-small-year-to-year)
- (org-link-escape): Re-apply changes accidentially overwritten
+ (org-link-escape): Re-apply changes accidentally overwritten
by last commit to Emacs.
2008-11-23 Carsten Dominik <carsten.dominik@gmail.com>
diff --git a/lisp/org/ob-coq.el b/lisp/org/ob-coq.el
index 56a57cdf649..d04a40dd3b3 100644
--- a/lisp/org/ob-coq.el
+++ b/lisp/org/ob-coq.el
@@ -27,7 +27,7 @@
;; session evaluation is supported. Requires both coq.el and
;; coq-inferior.el, both of which are distributed with Coq.
;;
-;; http://coq.inria.fr/
+;; https://coq.inria.fr/
;;; Code:
(require 'ob)
diff --git a/lisp/org/ob-core.el b/lisp/org/ob-core.el
index 7654c7ebe41..fe9af1ce602 100644
--- a/lisp/org/ob-core.el
+++ b/lisp/org/ob-core.el
@@ -2437,7 +2437,7 @@ INFO may provide the values of these header arguments (in the
(when location
(save-excursion
(goto-char location)
- (when (looking-at (concat org-babel-result-regexp ".*$"))
+ (when (looking-at org-babel-result-regexp)
(delete-region
(if keep-keyword (line-beginning-position 2)
(save-excursion
@@ -3053,9 +3053,8 @@ of `org-babel-temporary-directory'."
(if (eq t (car (file-attributes file)))
(delete-directory file)
(delete-file file)))
- ;; We do not want to delete "." and "..".
(directory-files org-babel-temporary-directory 'full
- (rx (or (not ".") "..."))))
+ directory-files-no-dot-files-regexp))
(delete-directory org-babel-temporary-directory))
(error
(message "Failed to remove temporary Org-babel directory %s"
diff --git a/lisp/org/ob-fortran.el b/lisp/org/ob-fortran.el
index 154465f28e1..149058f05f4 100644
--- a/lisp/org/ob-fortran.el
+++ b/lisp/org/ob-fortran.el
@@ -106,7 +106,7 @@ its header arguments."
(defun org-babel-fortran-ensure-main-wrap (body params)
"Wrap body in a \"program ... end program\" block if none exists."
- (if (string-match "^[ \t]*program[ \t]*.*" (capitalize body))
+ (if (string-match "^[ \t]*program\\>" (capitalize body))
(let ((vars (org-babel--get-vars params)))
(when vars (error "Cannot use :vars if `program' statement is present"))
body)
diff --git a/lisp/org/ob-js.el b/lisp/org/ob-js.el
index 8f66d102074..655e253d925 100644
--- a/lisp/org/ob-js.el
+++ b/lisp/org/ob-js.el
@@ -30,11 +30,11 @@
;;; Requirements:
-;; - a non-browser javascript engine such as node.js http://nodejs.org/
-;; or mozrepl http://wiki.github.com/bard/mozrepl/
+;; - a non-browser javascript engine such as node.js https://nodejs.org/
+;; or mozrepl https://wiki.github.com/bard/mozrepl/
;;
;; - for session based evaluation mozrepl and moz.el are required see
-;; http://wiki.github.com/bard/mozrepl/emacs-integration for
+;; https://wiki.github.com/bard/mozrepl/emacs-integration for
;; configuration instructions
;;; Code:
diff --git a/lisp/org/ob-plantuml.el b/lisp/org/ob-plantuml.el
index 5bf9e2beee4..49886e292e5 100644
--- a/lisp/org/ob-plantuml.el
+++ b/lisp/org/ob-plantuml.el
@@ -26,7 +26,7 @@
;; Org-Babel support for evaluating plantuml script.
;;
;; Inspired by Ian Yang's org-export-blocks-format-plantuml
-;; http://www.emacswiki.org/emacs/org-export-blocks-format-plantuml.el
+;; https://www.emacswiki.org/emacs/org-export-blocks-format-plantuml.el
;;; Requirements:
diff --git a/lisp/org/ob-ruby.el b/lisp/org/ob-ruby.el
index 90956271cf5..aa28bf18995 100644
--- a/lisp/org/ob-ruby.el
+++ b/lisp/org/ob-ruby.el
@@ -30,10 +30,10 @@
;; - ruby and irb executables :: http://www.ruby-lang.org/
;;
;; - ruby-mode :: Can be installed through ELPA, or from
-;; http://github.com/eschulte/rinari/raw/master/util/ruby-mode.el
+;; https://github.com/eschulte/rinari/raw/master/util/ruby-mode.el
;;
;; - inf-ruby mode :: Can be installed through ELPA, or from
-;; http://github.com/eschulte/rinari/raw/master/util/inf-ruby.el
+;; https://github.com/eschulte/rinari/raw/master/util/inf-ruby.el
;;; Code:
(require 'ob)
@@ -51,7 +51,8 @@
(defvar org-babel-default-header-args:ruby '())
(defvar org-babel-ruby-command "ruby"
- "Name of command to use for executing ruby code.")
+ "Name of command to use for executing ruby code.
+It's possible to override it by using a header argument `:ruby'")
(defcustom org-babel-ruby-hline-to "nil"
"Replace hlines in incoming tables with this when translating to ruby."
@@ -71,7 +72,7 @@
"Execute a block of Ruby code with Babel.
This function is called by `org-babel-execute-src-block'."
(let* ((session (org-babel-ruby-initiate-session
- (cdr (assq :session params))))
+ (cdr (assq :session params)) params))
(result-params (cdr (assq :result-params params)))
(result-type (cdr (assq :result-type params)))
(full-body (org-babel-expand-body:generic
@@ -147,14 +148,15 @@ Emacs-lisp table, otherwise return the results as a string."
res)
res)))
-(defun org-babel-ruby-initiate-session (&optional session _params)
+(defun org-babel-ruby-initiate-session (&optional session params)
"Initiate a ruby session.
If there is not a current inferior-process-buffer in SESSION
then create one. Return the initialized session."
(unless (string= session "none")
(require 'inf-ruby)
- (let* ((cmd (cdr (assoc inf-ruby-default-implementation
- inf-ruby-implementations)))
+ (let* ((cmd (cdr (or (assq :ruby params)
+ (assoc inf-ruby-default-implementation
+ inf-ruby-implementations))))
(buffer (get-buffer (format "*%s*" session)))
(session-buffer (or buffer (save-window-excursion
(run-ruby cmd session)
diff --git a/lisp/org/ob-sass.el b/lisp/org/ob-sass.el
index 60c081dcb38..c101574696c 100644
--- a/lisp/org/ob-sass.el
+++ b/lisp/org/ob-sass.el
@@ -35,7 +35,7 @@
;;; Requirements:
-;; - sass-mode :: http://github.com/nex3/haml/blob/master/extra/sass-mode.el
+;; - sass-mode :: https://github.com/nex3/haml/blob/master/extra/sass-mode.el
;;; Code:
(require 'ob)
diff --git a/lisp/org/ob-screen.el b/lisp/org/ob-screen.el
index ad00ee070d4..837c18f8407 100644
--- a/lisp/org/ob-screen.el
+++ b/lisp/org/ob-screen.el
@@ -126,7 +126,7 @@ The terminal should shortly flicker."
;; XXX: need to find a better way to do the following
(while (not (file-readable-p tmpfile))
;; do something, otherwise this will be optimized away
- (format "org-babel-screen: File not readable yet."))
+ (sit-for 0.1))
(setq tmp-string (with-temp-buffer
(insert-file-contents-literally tmpfile)
(buffer-substring (point-min) (point-max))))
diff --git a/lisp/org/ob-stan.el b/lisp/org/ob-stan.el
index c563a6c3e55..678047c8008 100644
--- a/lisp/org/ob-stan.el
+++ b/lisp/org/ob-stan.el
@@ -41,7 +41,7 @@
;; For more information and usage examples, visit
;; https://orgmode.org/worg/org-contrib/babel/languages/ob-doc-stan.html
;;
-;; [1] http://mc-stan.org/
+;; [1] https://mc-stan.org/
;;; Code:
(require 'ob)
diff --git a/lisp/org/ob-vala.el b/lisp/org/ob-vala.el
index e9c214f7dfc..b1c22756226 100644
--- a/lisp/org/ob-vala.el
+++ b/lisp/org/ob-vala.el
@@ -26,7 +26,7 @@
;;; Commentary:
;; ob-vala.el provides Babel support for the Vala language
-;; (see http://live.gnome.org/Vala for details)
+;; (see https://live.gnome.org/Vala for details)
;;; Requirements:
diff --git a/lisp/org/ol-gnus.el b/lisp/org/ol-gnus.el
index 99472315f67..71d55cd7c8d 100644
--- a/lisp/org/ol-gnus.el
+++ b/lisp/org/ol-gnus.el
@@ -34,7 +34,7 @@
(require 'gnus-sum)
(require 'gnus-util)
(require 'nnheader)
-(require 'nnir)
+(require 'nnselect)
(require 'ol)
@@ -140,9 +140,9 @@ If `org-store-link' was called with a prefix arg the meaning of
(`(nnvirtual . ,_)
(save-excursion
(car (nnvirtual-map-article (gnus-summary-article-number)))))
- (`(nnir . ,_)
+ (`(nnselect . ,_)
(save-excursion
- (nnir-article-group (gnus-summary-article-number))))
+ (nnselect-article-group (gnus-summary-article-number))))
(_ gnus-newsgroup-name)))
(header (if (eq major-mode 'gnus-article-mode)
;; When in an article, first move to summary
diff --git a/lisp/org/ol.el b/lisp/org/ol.el
index baed23bc9a4..c9e4da598ff 100644
--- a/lisp/org/ol.el
+++ b/lisp/org/ol.el
@@ -845,8 +845,8 @@ E.g. \"%C3%B6\" becomes the german o-Umlaut."
(insert link)
(insert (make-string (- (skip-chars-backward "\\\\"))
?\\))
- (while (search-backward "\]" nil t)
- (when (looking-at-p "\\]\\(?:[][]\\|\\'\\)")
+ (while (search-backward "]" nil t)
+ (when (looking-at-p "]\\(?:[][]\\|\\'\\)")
(insert (make-string (1+ (- (skip-chars-backward "\\\\")))
?\\))))
(buffer-string)))
diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el
index 4f89ea54500..689d134627e 100644
--- a/lisp/org/org-agenda.el
+++ b/lisp/org/org-agenda.el
@@ -1883,7 +1883,7 @@ Nil means don't hide any tags."
:group 'org-agenda-line-format
:type '(choice
(const :tag "Hide none" nil)
- (string :tag "Regexp ")))
+ (regexp :tag "Regexp ")))
(defvaralias 'org-agenda-remove-tags-when-in-prefix
'org-agenda-remove-tags)
@@ -1980,7 +1980,7 @@ category, you can use:
(\"Emacs\" \\='(space . (:width (16))))"
:group 'org-agenda-line-format
:version "24.1"
- :type '(alist :key-type (string :tag "Regexp matching category")
+ :type '(alist :key-type (regexp :tag "Regexp matching category")
:value-type (choice (list :tag "Icon"
(string :tag "File or data")
(symbol :tag "Type")
@@ -2995,7 +2995,8 @@ Agenda views are separated by `org-agenda-block-separator'."
(erase-buffer)
(insert (eval-when-compile
(let ((header
- "Press key for an agenda command:
+ (copy-sequence
+ "Press key for an agenda command:
-------------------------------- < Buffer, subtree/region restriction
a Agenda for current week or day > Remove restriction
t List of all TODO entries e Export agenda views
@@ -3004,7 +3005,7 @@ s Search for keywords M Like m, but only TODO entries
/ Multi-occur S Like s, but only TODO entries
? Find :FLAGGED: entries C Configure custom agenda commands
* Toggle sticky agenda views # List stuck projects (!=configure)
-")
+"))
(start 0))
(while (string-match
"\\(^\\| \\|(\\)\\(\\S-\\)\\( \\|=\\)"
@@ -8981,7 +8982,6 @@ fold drawers."
(narrow-to-region (org-entry-beginning-position)
(org-entry-end-position))
(org-show-all '(drawers))))
- (when arg )
(setq org-agenda-show-window (selected-window)))
(select-window win)))
diff --git a/lisp/org/org-capture.el b/lisp/org/org-capture.el
index 003cbef1fdf..ace51270175 100644
--- a/lisp/org/org-capture.el
+++ b/lisp/org/org-capture.el
@@ -1021,7 +1021,7 @@ Store them in the capture property list."
(apply #'encode-time 0 0
org-extend-today-until
(cl-cdddr (decode-time prompt-time))))
- ((string-match "\\([^ ]+\\)--?[^ ]+[ ]+\\(.*\\)"
+ ((string-match "\\([^ ]+\\)-[^ ]+[ ]+\\(.*\\)"
org-read-date-final-answer)
;; Replace any time range by its start.
(apply #'encode-time
diff --git a/lisp/org/org-element.el b/lisp/org/org-element.el
index 4b5f9a19e6d..ef64f58f81b 100644
--- a/lisp/org/org-element.el
+++ b/lisp/org/org-element.el
@@ -4144,7 +4144,9 @@ If STRING is the empty string or nil, return nil."
(dolist (v local-variables)
(ignore-errors
(if (symbolp v) (makunbound v)
- (set (make-local-variable (car v)) (cdr v)))))
+ ;; Don't set file name to avoid mishandling hooks (bug#44524)
+ (unless (memq (car v) '(buffer-file-name buffer-file-truename))
+ (set (make-local-variable (car v)) (cdr v))))))
;; Transferring local variables may put the temporary buffer
;; into a read-only state. Make sure we can insert STRING.
(let ((inhibit-read-only t)) (insert string))
@@ -4892,7 +4894,7 @@ with `org-element--cache-compare'. This cache is used in
A request is a vector with the following pattern:
- \[NEXT BEG END OFFSET PARENT PHASE]
+ [NEXT BEG END OFFSET PARENT PHASE]
Processing a synchronization request consists of three phases:
diff --git a/lisp/org/org-protocol.el b/lisp/org/org-protocol.el
index 0ff0e401d27..55a534d0dcd 100644
--- a/lisp/org/org-protocol.el
+++ b/lisp/org/org-protocol.el
@@ -278,7 +278,7 @@ This should be a single regexp string."
:group 'org-protocol
:version "24.4"
:package-version '(Org . "8.0")
- :type 'string)
+ :type 'regexp)
;;; Helper functions:
diff --git a/lisp/org/org-table.el b/lisp/org/org-table.el
index 49765472558..5c37cb1af52 100644
--- a/lisp/org/org-table.el
+++ b/lisp/org/org-table.el
@@ -198,7 +198,7 @@ Other options offered by the customize interface are more restrictive."
"^\\([<>]?[-+^.0-9]*[0-9][-+^.0-9eEdDx()%]*\\|[<>]?[-+]?0[xX][[:xdigit:].]+\\|[<>]?[-+]?[0-9]+#[0-9a-zA-Z.]+\\|nan\\|[-+u]?inf\\)$")
(const :tag "Very General Number-Like, including hex and Calc radix, allows comma as decimal mark"
"^\\([<>]?[-+^.,0-9]*[0-9][-+^.0-9eEdDx()%]*\\|[<>]?[-+]?0[xX][[:xdigit:].]+\\|[<>]?[-+]?[0-9]+#[0-9a-zA-Z.]+\\|nan\\|[-+u]?inf\\)$")
- (string :tag "Regexp:")))
+ (regexp :tag "Regexp:")))
(defcustom org-table-number-fraction 0.5
"Fraction of numbers in a column required to make the column align right.
@@ -2005,7 +2005,7 @@ the table and kill the editing buffer."
text)
(goto-char (point-min))
(while (re-search-forward "^#.*\n?" nil t) (replace-match ""))
- (while (re-search-forward "\\([ \t]*\n[ \t]*\\)+" nil t)
+ (while (re-search-forward "[ \t]*\n[ \t\n]*" nil t)
(replace-match " "))
(setq text (org-trim (buffer-string)))
(set-window-configuration cw)
@@ -3099,7 +3099,7 @@ function assumes the table is already analyzed (i.e., using
(let ((lhs (car e))
(rhs (cdr e)))
(cond
- ((string-match-p "\\`@-?[-+0-9]+\\$-?[0-9]+\\'" lhs)
+ ((string-match-p "\\`@[-+0-9]+\\$-?[0-9]+\\'" lhs)
;; This just refers to one fixed field.
(push e res))
((string-match-p "\\`[a-zA-Z][_a-zA-Z0-9]*\\'" lhs)
@@ -6122,7 +6122,7 @@ which will prompt for the width."
;; Here are two examples of different styles.
;; Unicode block characters are used to give a smooth effect.
-;; See http://en.wikipedia.org/wiki/Block_Elements
+;; See https://en.wikipedia.org/wiki/Block_Elements
;; Use one of those drawing functions
;; - orgtbl-ascii-draw (the default ascii)
;; - orgtbl-uc-draw-grid (unicode with a grid effect)
@@ -6136,7 +6136,7 @@ which will prompt for the width."
It is a variant of orgtbl-ascii-draw with Unicode block
characters, for a smooth display. Bars appear as grids (to the
extent the font allows)."
- ;; http://en.wikipedia.org/wiki/Block_Elements
+ ;; https://en.wikipedia.org/wiki/Block_Elements
;; best viewed with the "DejaVu Sans Mono" font.
(orgtbl-ascii-draw value min max width
" \u258F\u258E\u258D\u258C\u258B\u258A\u2589"))
diff --git a/lisp/org/org-tempo.el b/lisp/org/org-tempo.el
index 9ae2700549c..fe3b5f8da10 100644
--- a/lisp/org/org-tempo.el
+++ b/lisp/org/org-tempo.el
@@ -4,7 +4,7 @@
;;
;; Author: Rasmus Pank Roulund <emacs at pank dot eu>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Homepage: http://orgmode.org
+;; Homepage: https://orgmode.org
;;
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org/org.el b/lisp/org/org.el
index a7502d188e2..1ab8ab68880 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -223,7 +223,8 @@ byte-compiled before it is loaded."
(org-babel-tangle-file file tangled-file "emacs-lisp"))
(if compile
(progn
- (byte-compile-file tangled-file 'load)
+ (byte-compile-file tangled-file)
+ (load tangled-file)
(message "Compiled and loaded %s" tangled-file))
(load-file tangled-file)
(message "Loaded %s" tangled-file))))
@@ -460,7 +461,7 @@ Matched keyword is in group 1.")
org-clock-string)
t)
"\\)?"
- " *\\([[<][0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\} ?[^]\r\n>]*?[]>]"
+ " *\\([[<][0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}[^]\r\n>]*[]>]"
"\\|"
"<%%([^\r\n>]*>\\)")
"Matches a timestamp, possibly preceded by a keyword.")
@@ -564,14 +565,14 @@ Effort estimates given in this property need to have the format H:MM.")
;;;; Timestamp
-(defconst org-ts-regexp "<\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\} ?[^\r\n>]*?\\)>"
+(defconst org-ts-regexp "<\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}[^\r\n>]*\\)>"
"Regular expression for fast time stamp matching.")
(defconst org-ts-regexp-inactive
- "\\[\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\} ?[^\r\n>]*?\\)\\]"
+ "\\[\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}[^]\r\n>]*\\)\\]"
"Regular expression for fast inactive time stamp matching.")
-(defconst org-ts-regexp-both "[[<]\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\} ?[^]\r\n>]*?\\)[]>]"
+(defconst org-ts-regexp-both "[[<]\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}[^]\r\n>]*\\)[]>]"
"Regular expression for fast time stamp matching.")
(defconst org-ts-regexp0
@@ -11410,8 +11411,8 @@ D Show deadlines and scheduled items between a date range."
(setq type (or type org-sparse-tree-default-date-type))
(setq org-ts-type type)
(message "Sparse tree: [r]egexp [t]odo [T]odo-kwd [m]atch [p]roperty
- \[d]eadlines [b]efore-date [a]fter-date [D]ates range
- \[c]ycle through date types: %s"
+ [d]eadlines [b]efore-date [a]fter-date [D]ates range
+ [c]ycle through date types: %s"
(cl-case type
(all "all timestamps")
(scheduled "only scheduled")
diff --git a/lisp/org/ox-latex.el b/lisp/org/ox-latex.el
index edb3150796f..2f61abad9cc 100644
--- a/lisp/org/ox-latex.el
+++ b/lisp/org/ox-latex.el
@@ -1239,7 +1239,7 @@ calling `org-latex-compile'."
:package-version '(Org . "8.3")
:type '(repeat
(cons
- (string :tag "Regexp")
+ (regexp :tag "Regexp")
(string :tag "Message"))))
diff --git a/lisp/org/ox-odt.el b/lisp/org/ox-odt.el
index 51cb42a49a5..229b524f843 100644
--- a/lisp/org/ox-odt.el
+++ b/lisp/org/ox-odt.el
@@ -940,7 +940,7 @@ See `org-odt--build-date-styles' for implementation details."
(has-time-p (or (not timestamp)
(org-timestamp-has-time-p timestamp)))
(iso-date (let ((format (if has-time-p "%Y-%m-%dT%H:%M:%S"
- "%Y-%m-%dT%H:%M:%S")))
+ "%Y-%m-%d")))
(funcall format-timestamp timestamp format end))))
(if iso-date-p iso-date
(let* ((style (if has-time-p "OrgDate2" "OrgDate1"))
@@ -2199,10 +2199,10 @@ SHORT-CAPTION are strings."
(defun org-odt--image-size
(file info &optional user-width user-height scale dpi embed-as)
(let* ((--pixels-to-cms
- (function (lambda (pixels dpi)
- (let ((cms-per-inch 2.54)
- (inches (/ pixels dpi)))
- (* cms-per-inch inches)))))
+ (lambda (pixels dpi)
+ (let ((cms-per-inch 2.54)
+ (inches (/ pixels dpi)))
+ (* cms-per-inch inches))))
(--size-in-cms
(function
(lambda (size-in-pixels dpi)
diff --git a/lisp/org/ox.el b/lisp/org/ox.el
index 797efb90b79..2f8fd0c645b 100644
--- a/lisp/org/ox.el
+++ b/lisp/org/ox.el
@@ -5459,7 +5459,7 @@ transcoding it."
(apostrophe :utf-8 "’" :html "&rsquo;"))
("da"
;; one may use: »...«, "...", ›...‹, or '...'.
- ;; http://sproget.dk/raad-og-regler/retskrivningsregler/retskrivningsregler/a7-40-60/a7-58-anforselstegn/
+ ;; https://sproget.dk/raad-og-regler/retskrivningsregler/retskrivningsregler/a7-40-60/a7-58-anforselstegn/
;; LaTeX quotes require Babel!
(primary-opening
:utf-8 "»" :html "&raquo;" :latex ">>" :texinfo "@guillemetright{}")
@@ -5553,7 +5553,7 @@ transcoding it."
(secondary-closing :utf-8 "’" :html "&rsquo;" :latex "'" :texinfo "'")
(apostrophe :utf-8 "’" :html "&rsquo;"))
("ru"
- ;; http://ru.wikipedia.org/wiki/%D0%9A%D0%B0%D0%B2%D1%8B%D1%87%D0%BA%D0%B8#.D0.9A.D0.B0.D0.B2.D1.8B.D1.87.D0.BA.D0.B8.2C_.D0.B8.D1.81.D0.BF.D0.BE.D0.BB.D1.8C.D0.B7.D1.83.D0.B5.D0.BC.D1.8B.D0.B5_.D0.B2_.D1.80.D1.83.D1.81.D1.81.D0.BA.D0.BE.D0.BC_.D1.8F.D0.B7.D1.8B.D0.BA.D0.B5
+ ;; https://ru.wikipedia.org/wiki/%D0%9A%D0%B0%D0%B2%D1%8B%D1%87%D0%BA%D0%B8#.D0.9A.D0.B0.D0.B2.D1.8B.D1.87.D0.BA.D0.B8.2C_.D0.B8.D1.81.D0.BF.D0.BE.D0.BB.D1.8C.D0.B7.D1.83.D0.B5.D0.BC.D1.8B.D0.B5_.D0.B2_.D1.80.D1.83.D1.81.D1.81.D0.BA.D0.BE.D0.BC_.D1.8F.D0.B7.D1.8B.D0.BA.D0.B5
;; http://www.artlebedev.ru/kovodstvo/sections/104/
(primary-opening :utf-8 "«" :html "&laquo;" :latex "{}<<"
:texinfo "@guillemetleft{}")
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-27 04:33:45 +0000