summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2017-11-15 18:59:05 +0100
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2017-11-15 18:59:05 +0100
commit04e0532ef53b17c482fb81da2687fb403207eb55 (patch)
tree34ffa1a95457b53063266072b638234e55ad874c
parent966af419f98887673f37020ae5e05e5ce764006a (diff)
parent696ec60341b6f8190b92dae9a3cee940830a5f21 (diff)
downloadorg-mode-04e0532ef53b17c482fb81da2687fb403207eb55.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org-macs.el6
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/org-macs.el b/lisp/org-macs.el
index 78dac9e..9769546 100644
--- a/lisp/org-macs.el
+++ b/lisp/org-macs.el
@@ -277,8 +277,8 @@ Otherwise, return nil."
SEPARATORS is a regular expression. When nil, it defaults to
\"[ \f\t\n\r\v]+\".
-Unlike to `split-string', matching SEPARATORS at the beginning
-and end of string are ignored."
+Unlike `split-string', matching SEPARATORS at the beginning and
+end of string are ignored."
(let ((separators (or separators "[ \f\t\n\r\v]+")))
(when (string-match (concat "\\`" separators) string)
(setq string (replace-match "" nil nil string)))
@@ -350,7 +350,7 @@ text properties."
(defun org-string-width (string)
"Return width of STRING when displayed in the current buffer.
-Unlike to `string-width', this function takes into consideration
+Unlike `string-width', this function takes into consideration
`invisible' and `display' text properties."
(string-width (org-string-display string)))