mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-03 11:33:37 +00:00
Code Issues Releases Activity

Merge Org 7.8.10 -- important bug fixes since Org 7.8.09.

Browse Source
This commit is contained in:
Bastien Guerry 2012-05-16 19:33:50 +02:00
parent 4f32cc6c57
commit 8c8b834fa9
12 changed files with 218 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/misc/ChangeLog
View File

@ -1,3 +1,7 @@
2012-05-16 Bastien Guerry <bzg@gnu.org>
* org.texi (Durations and time values): Fix typo.
2012-05-12 Andreas Schwab <schwab@linux-m68k.org> 2012-05-12 Andreas Schwab <schwab@linux-m68k.org>
* cc-mode.texi: Avoid space before macro in 4th argument of cross * cc-mode.texi: Avoid space before macro in 4th argument of cross

10
doc/misc/org.texi
View File

@ -4,8 +4,8 @@
@setfilename ../../info/org @setfilename ../../info/org
@settitle The Org Manual @settitle The Org Manual
@set VERSION 7.8.09 @set VERSION 7.8.10
@set DATE April 2012 @set DATE May 2012
@c Use proper quote and backtick for code sections in PDF output @c Use proper quote and backtick for code sections in PDF output
@c Cf. Texinfo manual 14.2 @c Cf. Texinfo manual 14.2
@ -2625,7 +2625,7 @@ formulas or Elisp formulas:
Input duration values must be of the form @code{[HH:MM[:SS]}, where seconds Input duration values must be of the form @code{[HH:MM[:SS]}, where seconds
are optional. With the @code{T} flag, computed durations will be displayed are optional. With the @code{T} flag, computed durations will be displayed
as @code{[HH:MM:SS} (see the first formula above). With the @code{t} flag, as @code{HH:MM:SS} (see the first formula above). With the @code{t} flag,
computed durations will be displayed according to the value of the variable computed durations will be displayed according to the value of the variable
@code{org-table-duration-custom-format}, which defaults to @code{'hours} and @code{org-table-duration-custom-format}, which defaults to @code{'hours} and
will display the result as a fraction of hours (see the second formula in the will display the result as a fraction of hours (see the second formula in the
@ -7900,9 +7900,9 @@ Interactively select another agenda view and append it to the current view.
Delete other windows. Delete other windows.
@c @c
@orgcmdkskc{v d,d,org-agenda-day-view} @orgcmdkskc{v d,d,org-agenda-day-view}
@xorgcmdkskc{v w,w,org-agenda-day-view} @xorgcmdkskc{v w,w,org-agenda-week-view}
@xorgcmd{v m,org-agenda-month-view} @xorgcmd{v m,org-agenda-month-view}
@xorgcmd{v y,org-agenda-month-year} @xorgcmd{v y,org-agenda-year-view}
@xorgcmd{v SPC,org-agenda-reset-view} @xorgcmd{v SPC,org-agenda-reset-view}
@vindex org-agenda-span @vindex org-agenda-span
Switch to day/week/month/year view. When switching to day or week view, this Switch to day/week/month/year view. When switching to day or week view, this

BIN
etc/refcards/orgcard.pdf
View File

Binary file not shown.

2
etc/refcards/orgcard.tex
View File

@ -1,5 +1,5 @@
% Reference Card for Org Mode % Reference Card for Org Mode
\def\orgversionnumber{7.8.09} \def\orgversionnumber{7.8.10}
\def\versionyear{2012} % latest update \def\versionyear{2012} % latest update
\def\year{2012} % latest copyright year \def\year{2012} % latest copyright year

76
lisp/org/ChangeLog
View File

@ -1,3 +1,79 @@
2012-05-16 Bastien Guerry <bzg@gnu.org>
* org.el (org-scan-tags): Correctly match TODO keywords.
2012-05-16 Nicolas Goaziou <n.goaziou@gmail.com>
* org-list.el (org-list-struct): Fix white spaces.
(org-list-swap-items, org-list-send-item): Fix visibility
preservation.
2012-05-16 Nicolas Goaziou <n.goaziou@gmail.com>
* org-list.el (org-list-swap-items, org-list-send-item): Preserve
visibility when moving items.
2012-05-16 Mark E. Shoulson <mark@kli.org> (tiny change)
* org.el (org-fontify-entities): Hide {} when prettifying
entities.
2012-05-16 Bastien Guerry <bzg@gnu.org>
* org.el (org-cycle-internal-global): Prevent the display of
messages when cycling from with a Gnus article buffer.
2012-05-16 Bastien Guerry <bzg@gnu.org>
* org-table.el (org-table-time-seconds-to-string): Fix bug about
handling a negative duration value.
2012-05-16 Nicolas Goaziou <n.goaziou@gmail.com>
* org.el (org-link-expand-abbrev): Fix docstring.
2012-05-16 Nicolas Goaziou <n.goaziou@gmail.com>
* org.el (org-translate-link): Fix bug.
2012-05-16 Bastien Guerry <bzg@gnu.org>
* org-agenda.el (org-agenda-bulk-mark-regexp): Fix bug when
setting the number of marked entries.
2012-05-16 Bastien Guerry <bzg@gnu.org>
* org-table.el (org-tbl-calc-modes): Rename from
`org-table-modes'.
(org-set-calc-mode, org-table-eval-formula): Use it.
2012-05-16 Eric Schulte <eric.schulte@gmx.com>
* ob.el (org-babel-find-named-result): Fix bug finding empty named
results.
2012-05-16 Nicolas Goaziou <n.goaziou@gmail.com>
* org.el (org-set-regexps-and-options): Fix
`org-planning-or-clock-line-re' regexp. Indeed "\\>" will never
match since time keywords must end with colons, which are not word
constituent.
2012-05-16 Bastien Guerry <bzg@gnu.org>
* org-ctags.el (org-ctags-new-topic-template): Fix the option
default value back again.
2012-05-16 Eric Schulte <eric.schulte@gmx.com>
* org-bibtex.el (org-bibtex-export-to-kill-ring): Don't rely on
kill-new to return a string.
2012-05-16 Eric Schulte <eric.schulte@gmx.com>
* org-bibtex.el (org-bibtex-headline): Remove call to
bibtex-reformat which often hangs.
2012-04-26 Nicolas Goaziou <n.goaziou@gmail.com> 2012-04-26 Nicolas Goaziou <n.goaziou@gmail.com>
* org-table.el (org-table-number-fraction): Fix typo. * org-table.el (org-table-number-fraction): Fix typo.

2
lisp/org/ob.el
View File

@ -1498,7 +1498,7 @@ buffer or nil if no such result exists."
(catch 'is-a-code-block (catch 'is-a-code-block
(when (re-search-forward (when (re-search-forward
(concat org-babel-result-regexp (concat org-babel-result-regexp
"[ \t]" (regexp-quote name) "[ \t\n\f\v\r]+") nil t) "[ \t]" (regexp-quote name) "[ \t]*[\n\f\v\r]") nil t)
(when (and (string= "name" (downcase (match-string 1))) (when (and (string= "name" (downcase (match-string 1)))
(or (beginning-of-line 1) (or (beginning-of-line 1)
(looking-at org-babel-src-block-regexp) (looking-at org-babel-src-block-regexp)

4
lisp/org/org-agenda.el
View File

@ -8315,13 +8315,13 @@ This is a command that has to be installed in `calendar-mode-map'."
(defun org-agenda-bulk-mark-regexp (regexp) (defun org-agenda-bulk-mark-regexp (regexp)
"Mark entries match REGEXP." "Mark entries match REGEXP."
(interactive "sMark entries matching regexp: ") (interactive "sMark entries matching regexp: ")
(let (entries-marked) (let ((entries-marked 0))
(save-excursion (save-excursion
(goto-char (point-min)) (goto-char (point-min))
(goto-char (next-single-property-change (point) 'txt)) (goto-char (next-single-property-change (point) 'txt))
(while (re-search-forward regexp nil t) (while (re-search-forward regexp nil t)
(when (string-match regexp (get-text-property (point) 'txt)) (when (string-match regexp (get-text-property (point) 'txt))
(setq entries-marked (+ entries-marked 1)) (setq entries-marked (1+ entries-marked))
(call-interactively 'org-agenda-bulk-mark)))) (call-interactively 'org-agenda-bulk-mark))))
(if (not entries-marked) (if (not entries-marked)
(message "No entry matching this regexp.")))) (message "No entry matching this regexp."))))

5
lisp/org/org-bibtex.el
View File

@ -369,7 +369,7 @@ This variable is relevant only if `org-bibtex-export-tags-as-keywords` is t."
(progn (goto-char (match-end 1)) (insert ", ")) (progn (goto-char (match-end 1)) (insert ", "))
(bibtex-make-field "keywords" t t)) (bibtex-make-field "keywords" t t))
(insert (mapconcat #'identity tags ", "))) (insert (mapconcat #'identity tags ", ")))
(bibtex-reformat) (buffer-string))))))) (buffer-string)))))))
(defun org-bibtex-ask (field) (defun org-bibtex-ask (field)
(unless (assoc field org-bibtex-fields) (unless (assoc field org-bibtex-fields)
@ -661,7 +661,8 @@ This uses `bibtex-parse-entry'."
(defun org-bibtex-export-to-kill-ring () (defun org-bibtex-export-to-kill-ring ()
"Export current headline to kill ring as bibtex entry." "Export current headline to kill ring as bibtex entry."
(interactive) (interactive)
(kill-new (org-bibtex-headline))) (let ((result (org-bibtex-headline)))
(kill-new result) result))
(defun org-bibtex-search (string) (defun org-bibtex-search (string)
"Search for bibliographical entries in agenda files. "Search for bibliographical entries in agenda files.

66
lisp/org/org-list.el
View File

@ -714,15 +714,15 @@ Assume point is at an item."
;; equally indented than BEG-CELL's cdr. Also, store ending ;; equally indented than BEG-CELL's cdr. Also, store ending
;; position of items in END-LST-2. ;; position of items in END-LST-2.
(catch 'exit (catch 'exit
(while t (while t
(let ((ind (+ (or (get-text-property (point) 'original-indentation) 0) (let ((ind (+ (or (get-text-property (point) 'original-indentation) 0)
(org-get-indentation)))) (org-get-indentation))))
(cond (cond
((>= (point) lim-down) ((>= (point) lim-down)
;; At downward limit: this is de facto the end of the ;; At downward limit: this is de facto the end of the
;; list. Save point as an ending position, and jump to ;; list. Save point as an ending position, and jump to
;; part 3. ;; part 3.
(throw 'exit (throw 'exit
(push (cons 0 (funcall end-before-blank)) end-lst-2))) (push (cons 0 (funcall end-before-blank)) end-lst-2)))
;; At a verbatim block, move to its end. Point is at bol ;; At a verbatim block, move to its end. Point is at bol
;; and 'org-example property is set by whole lines: ;; and 'org-example property is set by whole lines:
@ -1071,8 +1071,10 @@ It determines the number of whitespaces to append by looking at
(defun org-list-swap-items (beg-A beg-B struct) (defun org-list-swap-items (beg-A beg-B struct)
"Swap item starting at BEG-A with item starting at BEG-B in STRUCT. "Swap item starting at BEG-A with item starting at BEG-B in STRUCT.
Blank lines at the end of items are left in place. Return the
new structure after the changes. Blank lines at the end of items are left in place. Item
visibility is preserved. Return the new structure after the
changes.
Assume BEG-A is lesser than BEG-B and that BEG-A and BEG-B belong Assume BEG-A is lesser than BEG-B and that BEG-A and BEG-B belong
to the same sub-list. to the same sub-list.
@ -1089,7 +1091,17 @@ This function modifies STRUCT."
(body-B (buffer-substring beg-B end-B-no-blank)) (body-B (buffer-substring beg-B end-B-no-blank))
(between-A-no-blank-and-B (buffer-substring end-A-no-blank beg-B)) (between-A-no-blank-and-B (buffer-substring end-A-no-blank beg-B))
(sub-A (cons beg-A (org-list-get-subtree beg-A struct))) (sub-A (cons beg-A (org-list-get-subtree beg-A struct)))
(sub-B (cons beg-B (org-list-get-subtree beg-B struct)))) (sub-B (cons beg-B (org-list-get-subtree beg-B struct)))
;; Store overlays responsible for visibility status. We
;; also need to store their boundaries as they will be
;; removed from buffer.
(overlays (cons
(mapcar (lambda (ov)
(list ov (overlay-start ov) (overlay-end ov)))
(overlays-in beg-A end-A))
(mapcar (lambda (ov)
(list ov (overlay-start ov) (overlay-end ov)))
(overlays-in beg-B end-B)))))
;; 1. Move effectively items in buffer. ;; 1. Move effectively items in buffer.
(goto-char beg-A) (goto-char beg-A)
(delete-region beg-A end-B-no-blank) (delete-region beg-A end-B-no-blank)
@ -1122,7 +1134,22 @@ This function modifies STRUCT."
(setcar e (+ pos (- size-B size-A))) (setcar e (+ pos (- size-B size-A)))
(setcar (nthcdr 6 e) (+ end-e (- size-B size-A)))))))) (setcar (nthcdr 6 e) (+ end-e (- size-B size-A))))))))
struct) struct)
(sort struct (lambda (e1 e2) (< (car e1) (car e2))))))) (setq struct (sort struct (lambda (e1 e2) (< (car e1) (car e2)))))
;; Restore visibility status, by moving overlays to their new
;; position.
(mapc (lambda (ov)
(move-overlay
(car ov)
(+ (nth 1 ov) (- (+ beg-B (- size-B size-A)) beg-A))
(+ (nth 2 ov) (- (+ beg-B (- size-B size-A)) beg-A))))
(car overlays))
(mapc (lambda (ov)
(move-overlay (car ov)
(+ (nth 1 ov) (- beg-A beg-B))
(+ (nth 2 ov) (- beg-A beg-B))))
(cdr overlays))
;; Return structure.
struct)))
(defun org-list-separating-blank-lines-number (pos struct prevs) (defun org-list-separating-blank-lines-number (pos struct prevs)
"Return number of blank lines that should separate items in list. "Return number of blank lines that should separate items in list.
@ -1340,8 +1367,8 @@ If DEST is a buffer position, the function will assume it points
to another item in the same list as ITEM, and will move the to another item in the same list as ITEM, and will move the
latter just before the former. latter just before the former.
If DEST is `begin' \(respectively `end'\), ITEM will be moved at If DEST is `begin' (respectively `end'), ITEM will be moved at
the beginning \(respectively end\) of the list it belongs to. the beginning (respectively end) of the list it belongs to.
If DEST is a string like \"N\", where N is an integer, ITEM will If DEST is a string like \"N\", where N is an integer, ITEM will
be moved at the Nth position in the list. be moved at the Nth position in the list.
@ -1351,6 +1378,8 @@ added to the kill-ring.
If DEST is `delete', ITEM will be deleted. If DEST is `delete', ITEM will be deleted.
Visibility of item is preserved.
This function returns, destructively, the new list structure." This function returns, destructively, the new list structure."
(let* ((prevs (org-list-prevs-alist struct)) (let* ((prevs (org-list-prevs-alist struct))
(item-end (org-list-get-item-end item struct)) (item-end (org-list-get-item-end item struct))
@ -1393,7 +1422,9 @@ This function returns, destructively, the new list structure."
(org-list-get-last-item item struct prevs)) (org-list-get-last-item item struct prevs))
(point-at-eol))))) (point-at-eol)))))
(t dest))) (t dest)))
(org-M-RET-may-split-line nil)) (org-M-RET-may-split-line nil)
;; Store visibility.
(visibility (overlays-in item item-end)))
(cond (cond
((eq dest 'delete) (org-list-delete-item item struct)) ((eq dest 'delete) (org-list-delete-item item struct))
((eq dest 'kill) ((eq dest 'kill)
@ -1429,9 +1460,14 @@ This function returns, destructively, the new list structure."
(+ end shift))))))) (+ end shift)))))))
moved-items)) moved-items))
(lambda (e1 e2) (< (car e1) (car e2)))))) (lambda (e1 e2) (< (car e1) (car e2))))))
;; 2. Eventually delete extra copy of the item and clean marker. ;; 2. Restore visibility.
(prog1 (mapc (lambda (ov)
(org-list-delete-item (marker-position item) struct) (move-overlay ov
(+ (overlay-start ov) (- (point) item))
(+ (overlay-end ov) (- (point) item))))
visibility)
;; 3. Eventually delete extra copy of the item and clean marker.
(prog1 (org-list-delete-item (marker-position item) struct)
(move-marker item nil))) (move-marker item nil)))
(t struct)))) (t struct))))

2
lisp/org/org-protocol.el
View File

@ -225,7 +225,7 @@ Consider using the interactive functions `org-protocol-create' and
:type 'alist) :type 'alist)
(defcustom org-protocol-protocol-alist nil (defcustom org-protocol-protocol-alist nil
"* Register custom handlers for org-protocol. "Register custom handlers for org-protocol.
Each element of this list must be of the form: Each element of this list must be of the form:

50
lisp/org/org-table.el
View File

@ -2368,7 +2368,7 @@ of the new mark."
(looking-at org-table-auto-recalculate-regexp)) (looking-at org-table-auto-recalculate-regexp))
(org-table-recalculate) t)) (org-table-recalculate) t))
(defvar org-table-modes) (defvar org-tbl-calc-modes) ;; Dynamically bound in `org-table-eval-formula'
(defsubst org-set-calc-mode (var &optional value) (defsubst org-set-calc-mode (var &optional value)
(if (stringp var) (if (stringp var)
(setq var (assoc var '(("D" calc-angle-mode deg) (setq var (assoc var '(("D" calc-angle-mode deg)
@ -2376,10 +2376,10 @@ of the new mark."
("F" calc-prefer-frac t) ("F" calc-prefer-frac t)
("S" calc-symbolic-mode t))) ("S" calc-symbolic-mode t)))
value (nth 2 var) var (nth 1 var))) value (nth 2 var) var (nth 1 var)))
(if (memq var org-table-modes) (if (memq var org-tbl-calc-modes)
(setcar (cdr (memq var org-table-modes)) value) (setcar (cdr (memq var org-tbl-calc-modes)) value)
(cons var (cons value org-table-modes))) (cons var (cons value org-tbl-calc-modes)))
org-table-modes) org-tbl-calc-modes)
(defun org-table-eval-formula (&optional arg equation (defun org-table-eval-formula (&optional arg equation
suppress-align suppress-const suppress-align suppress-const
@ -2437,7 +2437,7 @@ not overwrite the stored one."
equation equation
(org-table-get-formula equation (equal arg '(4))))) (org-table-get-formula equation (equal arg '(4)))))
(n0 (org-table-current-column)) (n0 (org-table-current-column))
(modes (copy-sequence org-calc-default-modes)) (org-tbl-calc-modes (copy-sequence org-calc-default-modes))
(numbers nil) ; was a variable, now fixed default (numbers nil) ; was a variable, now fixed default
(keep-empty nil) (keep-empty nil)
n form form0 formrpl formrg bw fmt x ev orig c lispp literal n form form0 formrpl formrg bw fmt x ev orig c lispp literal
@ -2453,12 +2453,13 @@ not overwrite the stored one."
(setq c (string-to-char (match-string 1 fmt)) (setq c (string-to-char (match-string 1 fmt))
n (string-to-number (match-string 2 fmt))) n (string-to-number (match-string 2 fmt)))
(if (= c ?p) (if (= c ?p)
(setq modes (org-set-calc-mode 'calc-internal-prec n)) (setq org-tbl-calc-modes (org-set-calc-mode 'calc-internal-prec n))
(setq modes (org-set-calc-mode (setq org-tbl-calc-modes
'calc-float-format (org-set-calc-mode
(list (cdr (assoc c '((?n . float) (?f . fix) 'calc-float-format
(?s . sci) (?e . eng)))) (list (cdr (assoc c '((?n . float) (?f . fix)
n)))) (?s . sci) (?e . eng))))
n))))
(setq fmt (replace-match "" t t fmt))) (setq fmt (replace-match "" t t fmt)))
(if (string-match "T" fmt) (if (string-match "T" fmt)
(setq duration t numbers t (setq duration t numbers t
@ -2479,7 +2480,7 @@ not overwrite the stored one."
(setq keep-empty t (setq keep-empty t
fmt (replace-match "" t t fmt))) fmt (replace-match "" t t fmt)))
(while (string-match "[DRFS]" fmt) (while (string-match "[DRFS]" fmt)
(setq modes (org-set-calc-mode (match-string 0 fmt))) (setq org-tbl-calc-modes (org-set-calc-mode (match-string 0 fmt)))
(setq fmt (replace-match "" t t fmt))) (setq fmt (replace-match "" t t fmt)))
(unless (string-match "\\S-" fmt) (unless (string-match "\\S-" fmt)
(setq fmt nil)))) (setq fmt nil))))
@ -2588,7 +2589,7 @@ not overwrite the stored one."
duration-output-format) ev)) duration-output-format) ev))
(or (fboundp 'calc-eval) (or (fboundp 'calc-eval)
(error "Calc does not seem to be installed, and is needed to evaluate the formula")) (error "Calc does not seem to be installed, and is needed to evaluate the formula"))
(setq ev (calc-eval (cons form modes) (if numbers 'num)) (setq ev (calc-eval (cons form org-tbl-calc-modes) (if numbers 'num))
ev (if duration (org-table-time-seconds-to-string ev (if duration (org-table-time-seconds-to-string
(string-to-number ev) (string-to-number ev)
duration-output-format) ev))) duration-output-format) ev)))
@ -3309,15 +3310,18 @@ If S is a string representing a number, keep this number."
"Convert a number of seconds to a time string. "Convert a number of seconds to a time string.
If OUTPUT-FORMAT is non-nil, return a number of days, hours, If OUTPUT-FORMAT is non-nil, return a number of days, hours,
minutes or seconds." minutes or seconds."
(cond ((eq output-format 'days) (let* ((secs0 (abs secs))
(format "%.3f" (/ (float secs) 86400))) (res
((eq output-format 'hours) (cond ((eq output-format 'days)
(format "%.2f" (/ (float secs) 3600))) (format "%.3f" (/ (float secs0) 86400)))
((eq output-format 'minutes) ((eq output-format 'hours)
(format "%.1f" (/ (float secs) 60))) (format "%.2f" (/ (float secs0) 3600)))
((eq output-format 'seconds) ((eq output-format 'minutes)
(format "%d" secs)) (format "%.1f" (/ (float secs0) 60)))
(t (org-format-seconds "%.2h:%.2m:%.2s" secs)))) ((eq output-format 'seconds)
(format "%d" secs0))
(t (org-format-seconds "%.2h:%.2m:%.2s" secs0)))))
(if (< secs 0) (concat "-" res) res)))
(defun org-table-fedit-convert-buffer (function) (defun org-table-fedit-convert-buffer (function)
"Convert all references in this buffer, using FUNCTION." "Convert all references in this buffer, using FUNCTION."

86
lisp/org/org.el
View File

@ -6,7 +6,7 @@
;; Maintainer: Bastien Guerry <bzg at gnu dot org> ;; Maintainer: Bastien Guerry <bzg at gnu dot org>
;; Keywords: outlines, hypermedia, calendar, wp ;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org ;; Homepage: http://orgmode.org
;; Version: 7.8.09 ;; Version: 7.8.10
;; ;;
;; This file is part of GNU Emacs. ;; This file is part of GNU Emacs.
;; ;;
@ -206,7 +206,7 @@ identifier."
;;; Version ;;; Version
(defconst org-version "7.8.09" (defconst org-version "7.8.10"
"The version number of the file org.el.") "The version number of the file org.el.")
;;;###autoload ;;;###autoload
@ -4789,10 +4789,11 @@ but the stars and the body are.")
"\\|" org-clock-string "\\)\\)?" "\\|" org-clock-string "\\)\\)?"
" *\\([[<][0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\} ?[^]\r\n>]*?[]>]\\|<%%([^\r\n>]*>\\)") " *\\([[<][0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\} ?[^]\r\n>]*?[]>]\\|<%%([^\r\n>]*>\\)")
org-planning-or-clock-line-re org-planning-or-clock-line-re
(concat "\\(?:^[ \t]*\\(" org-scheduled-string (concat "^[ \t]*\\("
"\\|" org-deadline-string org-scheduled-string "\\|"
"\\|" org-closed-string "\\|" org-clock-string org-deadline-string "\\|"
"\\)\\>\\)") org-closed-string "\\|"
org-clock-string "\\)")
org-all-time-keywords org-all-time-keywords
(mapcar (lambda (w) (substring w 0 -1)) (mapcar (lambda (w) (substring w 0 -1))
(list org-scheduled-string org-deadline-string (list org-scheduled-string org-deadline-string
@ -5916,16 +5917,19 @@ needs to be inserted at a specific position in the font-lock sequence.")
(when org-pretty-entities (when org-pretty-entities
(catch 'match (catch 'match
(while (re-search-forward (while (re-search-forward
"\\\\\\(frac[13][24]\\|[a-zA-Z]+\\)\\($\\|[^[:alpha:]\n]\\)" "\\\\\\(frac[13][24]\\|[a-zA-Z]+\\)\\($\\|{}\\|[^[:alpha:]\n]\\)"
limit t) limit t)
(if (and (not (org-in-indented-comment-line)) (if (and (not (org-in-indented-comment-line))
(setq ee (org-entity-get (match-string 1))) (setq ee (org-entity-get (match-string 1)))
(= (length (nth 6 ee)) 1)) (= (length (nth 6 ee)) 1))
(progn (let*
((end (if (equal (match-string 2) "{}")
(match-end 2)
(match-end 1))))
(add-text-properties (add-text-properties
(match-beginning 0) (match-end 1) (match-beginning 0) end
(list 'font-lock-fontified t)) (list 'font-lock-fontified t))
(compose-region (match-beginning 0) (match-end 1) (compose-region (match-beginning 0) end
(nth 6 ee) nil) (nth 6 ee) nil)
(backward-char 1) (backward-char 1)
(throw 'match t)))) (throw 'match t))))
@ -6255,34 +6259,36 @@ in special contexts.
(defun org-cycle-internal-global () (defun org-cycle-internal-global ()
"Do the global cycling action." "Do the global cycling action."
(cond ;; Hack to avoid display of messages for .org attachments in Gnus
((and (eq last-command this-command) (let ((ga (string-match "\\*fontification" (buffer-name))))
(eq org-cycle-global-status 'overview)) (cond
;; We just created the overview - now do table of contents ((and (eq last-command this-command)
;; This can be slow in very large buffers, so indicate action (eq org-cycle-global-status 'overview))
(run-hook-with-args 'org-pre-cycle-hook 'contents) ;; We just created the overview - now do table of contents
(message "CONTENTS...") ;; This can be slow in very large buffers, so indicate action
(org-content) (run-hook-with-args 'org-pre-cycle-hook 'contents)
(message "CONTENTS...done") (unless ga (message "CONTENTS..."))
(setq org-cycle-global-status 'contents) (org-content)
(run-hook-with-args 'org-cycle-hook 'contents)) (unless ga (message "CONTENTS...done"))
(setq org-cycle-global-status 'contents)
(run-hook-with-args 'org-cycle-hook 'contents))
((and (eq last-command this-command) ((and (eq last-command this-command)
(eq org-cycle-global-status 'contents)) (eq org-cycle-global-status 'contents))
;; We just showed the table of contents - now show everything ;; We just showed the table of contents - now show everything
(run-hook-with-args 'org-pre-cycle-hook 'all) (run-hook-with-args 'org-pre-cycle-hook 'all)
(show-all) (show-all)
(message "SHOW ALL") (unless ga (message "SHOW ALL"))
(setq org-cycle-global-status 'all) (setq org-cycle-global-status 'all)
(run-hook-with-args 'org-cycle-hook 'all)) (run-hook-with-args 'org-cycle-hook 'all))
(t (t
;; Default action: go to overview ;; Default action: go to overview
(run-hook-with-args 'org-pre-cycle-hook 'overview) (run-hook-with-args 'org-pre-cycle-hook 'overview)
(org-overview) (org-overview)
(message "OVERVIEW") (unless ga (message "OVERVIEW"))
(setq org-cycle-global-status 'overview) (setq org-cycle-global-status 'overview)
(run-hook-with-args 'org-cycle-hook 'overview)))) (run-hook-with-args 'org-cycle-hook 'overview)))))
(defun org-cycle-internal-local () (defun org-cycle-internal-local ()
"Do the local cycling action." "Do the local cycling action."
@ -8574,7 +8580,7 @@ call CMD."
;;; Link abbreviations ;;; Link abbreviations
(defun org-link-expand-abbrev (link) (defun org-link-expand-abbrev (link)
"Apply replacements as defined in `org-link-abbrev-alist." "Apply replacements as defined in `org-link-abbrev-alist'."
(if (string-match "^\\([^:]*\\)\\(::?\\(.*\\)\\)?$" link) (if (string-match "^\\([^:]*\\)\\(::?\\(.*\\)\\)?$" link)
(let* ((key (match-string 1 link)) (let* ((key (match-string 1 link))
(as (or (assoc key org-link-abbrev-alist-local) (as (or (assoc key org-link-abbrev-alist-local)
@ -9432,7 +9438,7 @@ If the link is in hidden text, expose it."
(string-match "\\([a-zA-Z0-9]+\\):\\(.*\\)" s)) (string-match "\\([a-zA-Z0-9]+\\):\\(.*\\)" s))
(progn (progn
(setq s (funcall org-link-translation-function (setq s (funcall org-link-translation-function
(match-string 1) (match-string 2))) (match-string 1 s) (match-string 2 s)))
(concat (car s) ":" (cdr s))) (concat (car s) ":" (cdr s)))
s)) s))
@ -12823,7 +12829,9 @@ headlines matching this string."
" *\\(\\<\\(" " *\\(\\<\\("
(mapconcat 'regexp-quote org-todo-keywords-1 "\\|") (mapconcat 'regexp-quote org-todo-keywords-1 "\\|")
(org-re (org-re
"\\>\\)\\)? *\\(.*?\\)\\(:[[:alnum:]_@#%:]+:\\)?[ \t]*$"))) (if todo-only
"\\>\\)\\)[ \t]+\\(.*?\\)\\(:[[:alnum:]_@#%:]+:\\)?[ \t]*$"
"\\>\\)\\)? *\\([^ ].*?\\)\\(:[[:alnum:]_@#%:]+:\\)?[ \t]*$"))))
(props (list 'face 'default (props (list 'face 'default
'done-face 'org-agenda-done 'done-face 'org-agenda-done
'undone-face 'default 'undone-face 'default