summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2019-12-03 21:55:00 -0500
committerKyle Meyer <kyle@kyleam.com>2019-12-03 21:55:00 -0500
commit12e87f46a19e5090fc2ceb1b068692a906c75fff (patch)
tree08a9402395e4a6385a73d1b910445d498271200b
parentce6c4adb2403edca1a483602b9d7bf2f18187b53 (diff)
parent8cd225a36caf891f2d223dee9cc7221e1a0a5700 (diff)
downloadorg-mode-12e87f46a19e5090fc2ceb1b068692a906c75fff.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/ol-bbdb.el8
-rw-r--r--lisp/org-agenda.el4
-rw-r--r--lisp/org-habit.el2
-rw-r--r--lisp/org.el2
4 files changed, 8 insertions, 8 deletions
diff --git a/lisp/ol-bbdb.el b/lisp/ol-bbdb.el
index bf99c61..d53a0cd 100644
--- a/lisp/ol-bbdb.el
+++ b/lisp/ol-bbdb.el
@@ -162,13 +162,13 @@ used."
'(("birthday" .
(lambda (name years suffix)
(concat "Birthday: [[bbdb:" name "][" name " ("
- (format "%s" years) ; handles numbers as well as strings
- suffix ")]]")))
+ (format "%s" years) ; handles numbers as well as strings
+ suffix ")]]")))
("wedding" .
(lambda (name years suffix)
(concat "[[bbdb:" name "][" name "'s "
- (format "%s" years)
- suffix " wedding anniversary]]"))))
+ (format "%s" years)
+ suffix " wedding anniversary]]"))))
"How different types of anniversaries should be formatted.
An alist of elements (STRING . FORMAT) where STRING is the name of an
anniversary class and format is either:
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index a25016e..4c2854f 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -8581,14 +8581,14 @@ When called with a prefix argument, include all archive files as well."
(if (or org-agenda-category-filter
(get 'org-agenda-category-filter :preset-filter))
'(:eval (propertize
- (concat "["
+ (concat "["
(mapconcat
'identity
(append
(get 'org-agenda-category-filter :preset-filter)
org-agenda-category-filter)
"")
- "]")
+ "]")
'face 'org-agenda-filter-category
'help-echo "Category used in filtering")) "")
(if (or org-agenda-tag-filter
diff --git a/lisp/org-habit.el b/lisp/org-habit.el
index 77efad1..f2212ce 100644
--- a/lisp/org-habit.el
+++ b/lisp/org-habit.el
@@ -409,7 +409,7 @@ current time."
'help-echo
(concat (format-time-string
(org-time-stamp-format)
- (time-add starting (days-to-time (- start (time-to-days starting)))))
+ (time-add starting (days-to-time (- start (time-to-days starting)))))
(if donep " DONE" ""))
graph))
(setq start (1+ start)
diff --git a/lisp/org.el b/lisp/org.el
index d78321e..6a18093 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -16206,7 +16206,7 @@ BEG and END are buffer positions."
;; Emacs cannot overlay images from remote hosts. Create it in
;; `temporary-file-directory' instead.
(if (or (not file) (file-remote-p file))
- temporary-file-directory
+ temporary-file-directory
default-directory)
'overlays nil 'forbuffer org-preview-latex-default-process))))