mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-12-03 08:30:03 +00:00
Merge branch 'maint' of code.orgmode.org:bzg/org-mode into maint
This commit is contained in:
Bastien
commit
9067b8427d
@ -2475,7 +2475,7 @@ in the buffer."
|
||||
(point))))))
|
||||
|
||||
(defun org-babel-result-to-file (result &optional description)
|
||||
"Convert RESULT into an `org-mode' link with optional DESCRIPTION.
|
||||
"Convert RESULT into an Org link with optional DESCRIPTION.
|
||||
If the `default-directory' is different from the containing
|
||||
file's directory then expand relative links."
|
||||
(when (stringp result)
|
||||
|
||||
@ -39,9 +39,9 @@
|
||||
;; directory).
|
||||
|
||||
;; Although it might seem more natural to use Emacs Lisp for most
|
||||
;; Lisp-based programming tasks inside Org-Mode, an Emacs library
|
||||
;; written in Emacs Lisp, PicoLisp has at least two outstanding
|
||||
;; features that make it a valuable addition to Org-Babel:
|
||||
;; Lisp-based programming tasks inside Org, an Emacs library written
|
||||
;; in Emacs Lisp, PicoLisp has at least two outstanding features that
|
||||
;; make it a valuable addition to Org Babel:
|
||||
|
||||
;; PicoLisp _is_ an object-oriented database with a Prolog-based query
|
||||
;; language implemented in PicoLisp (Pilog). Database objects are
|
||||
|
||||
@ -3563,7 +3563,7 @@ removed from the entry content. Currently only `planning' is allowed here."
|
||||
txt))
|
||||
|
||||
(defun org-check-for-org-mode ()
|
||||
"Make sure current buffer is in org-mode. Error if not."
|
||||
"Make sure current buffer is in Org mode. Error if not."
|
||||
(or (derived-mode-p 'org-mode)
|
||||
(error "Cannot execute Org agenda command on buffer in %s"
|
||||
major-mode)))
|
||||
@ -4509,7 +4509,7 @@ is active."
|
||||
(with-current-buffer buffer
|
||||
(with-syntax-table (org-search-syntax-table)
|
||||
(unless (derived-mode-p 'org-mode)
|
||||
(error "Agenda file %s is not in `org-mode'" file))
|
||||
(error "Agenda file %s is not in Org mode" file))
|
||||
(let ((case-fold-search t))
|
||||
(save-excursion
|
||||
(save-restriction
|
||||
@ -4774,7 +4774,7 @@ The prefix arg TODO-ONLY limits the search to TODO entries."
|
||||
rtnall (append rtnall rtn))
|
||||
(with-current-buffer buffer
|
||||
(unless (derived-mode-p 'org-mode)
|
||||
(error "Agenda file %s is not in `org-mode'" file))
|
||||
(error "Agenda file %s is not in Org mode" file))
|
||||
(save-excursion
|
||||
(save-restriction
|
||||
(if (eq buffer org-agenda-restrict)
|
||||
@ -5067,9 +5067,9 @@ of what a project is and how to check if it stuck, customize the variable
|
||||
|
||||
(defun org-agenda-cleanup-fancy-diary ()
|
||||
"Remove unwanted stuff in buffer created by `fancy-diary-display'.
|
||||
This gets rid of the date, the underline under the date, and
|
||||
the dummy entry installed by `org-mode' to ensure non-empty diary for each
|
||||
date. It also removes lines that contain only whitespace."
|
||||
This gets rid of the date, the underline under the date, and the
|
||||
dummy entry installed by Org mode to ensure non-empty diary for
|
||||
each date. It also removes lines that contain only whitespace."
|
||||
(goto-char (point-min))
|
||||
(if (looking-at ".*?:[ \t]*")
|
||||
(progn
|
||||
@ -5214,7 +5214,7 @@ the documentation of `org-diary'."
|
||||
(list (format "ORG-AGENDA-ERROR: No such org-file %s" file))
|
||||
(with-current-buffer buffer
|
||||
(unless (derived-mode-p 'org-mode)
|
||||
(error "Agenda file %s is not in `org-mode'" file))
|
||||
(error "Agenda file %s is not in Org mode" file))
|
||||
(setq org-agenda-buffer (or org-agenda-buffer buffer))
|
||||
(setf org-agenda-current-date date)
|
||||
(save-excursion
|
||||
|
||||
@ -4311,14 +4311,14 @@ FACE, when non-nil, for the highlight."
|
||||
|
||||
;;;###autoload
|
||||
(define-minor-mode orgtbl-mode
|
||||
"The `org-mode' table editor as a minor mode for use in other modes."
|
||||
"The Org mode table editor as a minor mode for use in other modes."
|
||||
:lighter " OrgTbl" :keymap orgtbl-mode-map
|
||||
(org-load-modules-maybe)
|
||||
(cond
|
||||
((derived-mode-p 'org-mode)
|
||||
;; Exit without error, in case some hook functions calls this
|
||||
;; by accident in org-mode.
|
||||
(message "Orgtbl-mode is not useful in org-mode, command ignored"))
|
||||
;; Exit without error, in case some hook functions calls this by
|
||||
;; accident in Org mode.
|
||||
(message "Orgtbl mode is not useful in Org mode, command ignored"))
|
||||
(orgtbl-mode
|
||||
(and (orgtbl-setup) (defun orgtbl-setup () nil)) ;; FIXME: Yuck!?!
|
||||
;; Make sure we are first in minor-mode-map-alist
|
||||
|
||||
@ -57,7 +57,7 @@
|
||||
:description (or w3m-current-title w3m-current-url))))
|
||||
|
||||
(defun org-w3m-copy-for-org-mode ()
|
||||
"Copy current buffer content or active region with `org-mode' style links.
|
||||
"Copy current buffer content or active region with Org style links.
|
||||
This will encode `link-title' and `link-location' with
|
||||
`org-make-link-string', and insert the transformed test into the kill ring,
|
||||
so that it can be yanked into an Org buffer with links working correctly."
|
||||
@ -94,7 +94,7 @@ so that it can be yanked into an Org buffer with links working correctly."
|
||||
;; get link title at current point.
|
||||
(setq link-title (buffer-substring (point)
|
||||
(org-w3m-get-anchor-end)))
|
||||
;; concat `org-mode' style url to `return-content'.
|
||||
;; concat Org style url to `return-content'.
|
||||
(setq return-content (concat return-content
|
||||
(org-make-link-string
|
||||
link-location link-title))))
|
||||
|
||||
@ -749,7 +749,7 @@ For export specific modules, see also `org-export-backends'."
|
||||
(const :tag "C panel: Simple routines for us with bad memory" org-panel)
|
||||
(const :tag "C registry: A registry for Org links" org-registry)
|
||||
(const :tag "C screen: Visit screen sessions through Org links" org-screen)
|
||||
(const :tag "C secretary: Team management with org-mode" org-secretary)
|
||||
(const :tag "C secretary: Team management with Org" org-secretary)
|
||||
(const :tag "C sqlinsert: Convert Org tables to SQL insertions" orgtbl-sqlinsert)
|
||||
(const :tag "C toc: Table of contents for Org buffer" org-toc)
|
||||
(const :tag "C track: Keep up with Org mode development" org-track)
|
||||
@ -4873,7 +4873,7 @@ After a match, the following groups carry important information:
|
||||
("beamer" org-startup-with-beamer-mode t)
|
||||
("entitiespretty" org-pretty-entities t)
|
||||
("entitiesplain" org-pretty-entities nil))
|
||||
"Variable associated with STARTUP options for org-mode.
|
||||
"Variable associated with STARTUP options for Org.
|
||||
Each element is a list of three items: the startup options (as written
|
||||
in the #+STARTUP line), the corresponding variable, and the value to set
|
||||
this variable to if the option is found. An optional forth element PUSH
|
||||
@ -5937,7 +5937,7 @@ by a #."
|
||||
(defun org-fontify-meta-lines-and-blocks (limit)
|
||||
(condition-case nil
|
||||
(org-fontify-meta-lines-and-blocks-1 limit)
|
||||
(error (message "org-mode fontification error in %S at %d"
|
||||
(error (message "Org mode fontification error in %S at %d"
|
||||
(current-buffer)
|
||||
(line-number-at-pos)))))
|
||||
|
||||
|
||||
@ -79,7 +79,7 @@ BTEST = $(BATCH) $(BTEST_INIT) \
|
||||
$(foreach req,$(BTEST_EXTRA),$(req-extra)) \
|
||||
--eval '(org-test-run-batch-tests org-test-select-re)'
|
||||
|
||||
# Running a plain emacs with no config and this Org-mode loaded. This
|
||||
# Running a plain emacs with no config and this Org mode loaded. This
|
||||
# should be useful for manual testing and verification of problems.
|
||||
NOBATCH = $(EMACSQ) $(BTEST_INIT) -l org -f org-version
|
||||
|
||||
|
||||
@ -12,7 +12,7 @@ while (<IN>) {
|
||||
print OUT '<link rel="stylesheet" href="http://orgmode.org/org-manual.css" type="text/css" />';
|
||||
} elsif (/<div class="contents">/) {
|
||||
print OUT;
|
||||
print OUT '<p>This is the official manual for the latest <a href="http://orgmode.org">Org-mode</a> release.</p><div id="table-of-contents">';
|
||||
print OUT '<p>This is the official manual for the latest <a href="http://orgmode.org">Org mode</a> release.</p><div id="table-of-contents">';
|
||||
} elsif (/<h2>Table of Contents<\/h2>/) {
|
||||
print OUT;
|
||||
print OUT '<a href="http://orgmode.org">http://orgmode.org</a><br/><div id="text-table-of-contents">';
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
"Make the file org-version.el in the current directory.
|
||||
This function is internally used by the build system and should
|
||||
be used by foreign build systems or installers to produce this
|
||||
file in the installation directory of org-mode. Org will not
|
||||
file in the installation directory of Org mode. Org will not
|
||||
work correctly if this file is not present (except directly from
|
||||
the Git work tree)."
|
||||
(with-temp-buffer
|
||||
@ -47,7 +47,7 @@ Inserted by installing Org mode or when a release is made.\"
|
||||
org-release))
|
||||
;;;\#\#\#autoload
|
||||
\(defun org-git-version ()
|
||||
\"The Git version of org-mode.
|
||||
\"The Git version of Org mode.
|
||||
Inserted by installing Org or when a release is made.\"
|
||||
(let ((org-git-version \"" org-git-version "\"))
|
||||
org-git-version))
|
||||
@ -65,7 +65,7 @@ Inserted by installing Org or when a release is made.\"
|
||||
"Make the file org-loaddefs.el in the current directory.
|
||||
This function is internally used by the build system and should
|
||||
be used by foreign build systems or installers to produce this
|
||||
file in the installation directory of org-mode. Org will not
|
||||
file in the installation directory of Org mode. Org will not
|
||||
work correctly if this file is not up-to-date."
|
||||
(with-temp-buffer
|
||||
(set-visited-file-name "org-loaddefs.el")
|
||||
|
||||
@ -54,7 +54,7 @@ close(IN);
|
||||
|
||||
print <<HEAD;
|
||||
================================================================================
|
||||
Org-Mode Reference Card (for version $orgversionnumber)
|
||||
Org Mode Reference Card (for version $orgversionnumber)
|
||||
================================================================================
|
||||
HEAD
|
||||
|
||||
@ -74,7 +74,7 @@ while(<IN>){
|
||||
}
|
||||
next if($page != 1);
|
||||
next if(/^%/);
|
||||
next if /Org-Mode Reference Card \([12]\/2\)/;
|
||||
next if /Org Mode Reference Card \([12]\/2\)/;
|
||||
next if /\\centerline{\(for version \\orgversionnumber\)}/;
|
||||
next if /\(for version \)/;
|
||||
next if /\\newcolumn/;
|
||||
|
||||
@ -68,7 +68,7 @@ config-cmd config-all::
|
||||
$(foreach var,$(CONF_CALL),$(info $(var) = $($(var))$(EOL)))
|
||||
config config-test config-exe config-all config-version::
|
||||
$(info ========= Org version)
|
||||
$(info make: Org-mode version $(ORGVERSION) ($(GITVERSION) => $(lispdir)))
|
||||
$(info make: Org mode version $(ORGVERSION) ($(GITVERSION) => $(lispdir)))
|
||||
@echo ""
|
||||
|
||||
oldorg: compile info # what the old makefile did when no target was specified
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
# -*- mode:org -*-
|
||||
#+TITLE: Org-mode Testing
|
||||
#+TITLE: Org mode Testing
|
||||
#+PROPERTY: results silent
|
||||
|
||||
* Dependencies
|
||||
@ -11,9 +11,9 @@ repository]].
|
||||
|
||||
* Non-interactive batch testing from the command line
|
||||
|
||||
The simplest way to run the Org-mode test suite is from the command
|
||||
The simplest way to run the Org mode test suite is from the command
|
||||
line with the following invocation. Note that the paths below are
|
||||
relative to the base of the Org-mode directory.
|
||||
relative to the base of the Org mode directory.
|
||||
|
||||
Also note that many of the current tests uses babel evaluation...
|
||||
|
||||
@ -32,8 +32,8 @@ The options in the above command are explained below.
|
||||
|
||||
| -Q | ignores any personal configuration ensuring a vanilla Emacs instance is used |
|
||||
| --batch | runs Emacs in "batch" mode with no gui and termination after execution |
|
||||
| -l | loads Org-mode and the org mode test suite defined in testing/org-test.el |
|
||||
| --eval | reloads Org-mode and allows evaluation of code blocks by the tests |
|
||||
| -l | loads Org mode and the Org mode test suite defined in testing/org-test.el |
|
||||
| --eval | reloads Org mode and allows evaluation of code blocks by the tests |
|
||||
| -f | actually runs the tests using the `org-test-run-batch-tests' function |
|
||||
|
||||
* Trigger the tests with 'make'
|
||||
@ -88,7 +88,7 @@ Ran 2 tests, 2 results as expected (2017-12-28 15:04:45+0100)
|
||||
|
||||
* Interactive testing from within Emacs
|
||||
|
||||
To run the Org-mode test suite from a current Emacs instance simply
|
||||
To run the Org mode test suite from a current Emacs instance simply
|
||||
load and run the test suite with the following commands.
|
||||
|
||||
1) First load the test suite.
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
This is an example file for use by the Org-mode tests.
|
||||
This is an example file for use by the Org mode tests.
|
||||
|
||||
This file is special because it has no headings, which can be
|
||||
erroneously assumed by some code.
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
#+OPTIONS: num:nil ^:nil
|
||||
#+STARTUP: hideblocks
|
||||
|
||||
This is an example file for use by the Org-mode tests.
|
||||
This is an example file for use by the Org mode tests.
|
||||
|
||||
* top
|
||||
** code block
|
||||
|
||||
Loading…
Reference in New Issue
Block a user