aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/org
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/org')
-rw-r--r--lisp/org/org-clock.el2
-rw-r--r--lisp/org/org-compat.el2
-rw-r--r--lisp/org/org-list.el2
-rw-r--r--lisp/org/org.el6
4 files changed, 6 insertions, 6 deletions
diff --git a/lisp/org/org-clock.el b/lisp/org/org-clock.el
index b1a8a4b9fdb..6279ed3df0d 100644
--- a/lisp/org/org-clock.el
+++ b/lisp/org/org-clock.el
@@ -2125,7 +2125,7 @@ the currently selected interval size."
2125 "Write out a clock table at position IPOS in the current buffer. 2125 "Write out a clock table at position IPOS in the current buffer.
2126TABLES is a list of tables with clocking data as produced by 2126TABLES is a list of tables with clocking data as produced by
2127`org-clock-get-table-data'. PARAMS is the parameter property list obtained 2127`org-clock-get-table-data'. PARAMS is the parameter property list obtained
2128from the dynamic block defintion." 2128from the dynamic block definition."
2129 ;; This function looks quite complicated, mainly because there are a 2129 ;; This function looks quite complicated, mainly because there are a
2130 ;; lot of options which can add or remove columns. I have massively 2130 ;; lot of options which can add or remove columns. I have massively
2131 ;; commented this function, the I hope it is understandable. If 2131 ;; commented this function, the I hope it is understandable. If
diff --git a/lisp/org/org-compat.el b/lisp/org/org-compat.el
index 896acc5aeae..5e4935caa7e 100644
--- a/lisp/org/org-compat.el
+++ b/lisp/org/org-compat.el
@@ -272,7 +272,7 @@ Works on both Emacs and XEmacs."
272 nil)) 272 nil))
273 273
274(defmacro org-xemacs-without-invisibility (&rest body) 274(defmacro org-xemacs-without-invisibility (&rest body)
275 "Turn off exents with invisibility while executing BODY." 275 "Turn off extents with invisibility while executing BODY."
276 `(let ((ext-inv (extent-list nil (point-at-bol) (point-at-eol) 276 `(let ((ext-inv (extent-list nil (point-at-bol) (point-at-eol)
277 'all-extents-closed-open 'invisible)) 277 'all-extents-closed-open 'invisible))
278 ext-inv-specs) 278 ext-inv-specs)
diff --git a/lisp/org/org-list.el b/lisp/org/org-list.el
index 14b3e12c888..1a14c71d510 100644
--- a/lisp/org/org-list.el
+++ b/lisp/org/org-list.el
@@ -681,7 +681,7 @@ Assume point is at an item."
681 (cond 681 (cond
682 ((<= (point) lim-up) 682 ((<= (point) lim-up)
683 ;; At upward limit: if we ended at an item, store it, 683 ;; At upward limit: if we ended at an item, store it,
684 ;; else dimiss useless data recorded above BEG-CELL. 684 ;; else dismiss useless data recorded above BEG-CELL.
685 ;; Jump to part 2. 685 ;; Jump to part 2.
686 (throw 'exit 686 (throw 'exit
687 (setq itm-lst 687 (setq itm-lst
diff --git a/lisp/org/org.el b/lisp/org/org.el
index 5d988b3cecd..f88ed3c7ebc 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -1482,7 +1482,7 @@ in the search text."
1482 :type '(choice 1482 :type '(choice
1483 (const :tag "Use fuzy text search" nil) 1483 (const :tag "Use fuzy text search" nil)
1484 (const :tag "Match only exact headline" t) 1484 (const :tag "Match only exact headline" t)
1485 (const :tag "Match extact headline or query to create it" 1485 (const :tag "Match exact headline or query to create it"
1486 query-to-create))) 1486 query-to-create)))
1487 1487
1488(defcustom org-link-frame-setup 1488(defcustom org-link-frame-setup
@@ -5052,7 +5052,7 @@ The time stamps may be either active or inactive.")
5052(defvar org-emph-face nil) 5052(defvar org-emph-face nil)
5053 5053
5054(defun org-do-emphasis-faces (limit) 5054(defun org-do-emphasis-faces (limit)
5055 "Run through the buffer and add overlays to emphasised strings." 5055 "Run through the buffer and add overlays to emphasized strings."
5056 (let (rtn a) 5056 (let (rtn a)
5057 (while (and (not rtn) (re-search-forward org-emph-re limit t)) 5057 (while (and (not rtn) (re-search-forward org-emph-re limit t))
5058 (if (not (= (char-after (match-beginning 3)) 5058 (if (not (= (char-after (match-beginning 3))
@@ -14835,7 +14835,7 @@ user."
14835 (setq ans (replace-match (format "%04d-%02d-%02d\\5" year month day) 14835 (setq ans (replace-match (format "%04d-%02d-%02d\\5" year month day)
14836 t nil ans))) 14836 t nil ans)))
14837 14837
14838 ;; Help matching dottet european dates 14838 ;; Help matching dotted european dates
14839 (when (string-match 14839 (when (string-match
14840 "^ *\\(3[01]\\|0?[1-9]\\|[12][0-9]\\)\\. ?\\(0?[1-9]\\|1[012]\\)\\. ?\\([1-9][0-9][0-9][0-9]\\)?" ans) 14840 "^ *\\(3[01]\\|0?[1-9]\\|[12][0-9]\\)\\. ?\\(0?[1-9]\\|1[012]\\)\\. ?\\([1-9][0-9][0-9][0-9]\\)?" ans)
14841 (setq year (if (match-end 3) 14841 (setq year (if (match-end 3)