summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2014-01-08 23:48:16 (GMT)
committer Bastien Guerry <bzg@altern.org>2014-01-08 23:48:16 (GMT)
commit213c78f73c5b30d31cff5a860551df4f0e63cc2e (patch)
treefdf83617d80bc770609ef5394bab4a4a9e9a07c2
parent0652a10bf3cce40242e0787a0dab87bfebbcb690 (diff)
parentabed7277e1f6bfb4b901f770f2a28e060e2a96d3 (diff)
downloadorg-mode-213c78f73c5b30d31cff5a860551df4f0e63cc2e.zip
org-mode-213c78f73c5b30d31cff5a860551df4f0e63cc2e.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org-agenda.el2
-rw-r--r--lisp/org-irc.el4
2 files changed, 3 insertions, 3 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 3c964d4..5b1ff08 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -765,7 +765,7 @@ to make his option also apply to the tags-todo list."
(integer :tag "Ignore if N or more days in past(-) or future(+).")))
(defcustom org-agenda-todo-ignore-deadlines nil
- "Non-nil means ignore some deadlined TODO items when making TODO list.
+ "Non-nil means ignore some deadline TODO items when making TODO list.
There are different motivations for using different values, please think
carefully when configuring this variable.
diff --git a/lisp/org-irc.el b/lisp/org-irc.el
index 9d2d20c..8f9761b 100644
--- a/lisp/org-irc.el
+++ b/lisp/org-irc.el
@@ -105,7 +105,7 @@ attributes that are found."
((eq major-mode 'erc-mode)
(org-irc-erc-store-link))))
-(defun org-irc-elipsify-description (string &optional after)
+(defun org-irc-ellipsify-description (string &optional after)
"Remove unnecessary white space from STRING and add ellipses if necessary.
Strip starting and ending white space from STRING and replace any
chars that the value AFTER with '...'"
@@ -158,7 +158,7 @@ the session itself."
(progn
(org-store-link-props
:type "file"
- :description (concat "'" (org-irc-elipsify-description
+ :description (concat "'" (org-irc-ellipsify-description
(cadr parsed-line) 20)
"' from an IRC conversation")
:link (concat "file:" (car parsed-line) "::"