summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2014-01-09 00:47:40 +0100
committerBastien Guerry <bzg@altern.org>2014-01-09 00:47:40 +0100
commitabed7277e1f6bfb4b901f770f2a28e060e2a96d3 (patch)
treedf3d76e37275b0d514b89770e09eef64bb6979a5
parentba4852ec74ea8159ac91a0bbc88469e7617b4963 (diff)
downloadorg-mode-abed7277e1f6bfb4b901f770f2a28e060e2a96d3.tar.gz
Backport typo fixes from Emacs revno r115923
-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 116909d..ccf08a2 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -764,7 +764,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) "::"