summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2012-08-15 09:22:51 +0200
committerBastien Guerry <bzg@altern.org>2012-08-15 09:22:51 +0200
commit16ea0364a4e1c561a9f166586e484b5c1235683c (patch)
tree442f21bf08e85379d298428d1ec7982f70577325
parent7f6a127e46f3145ae2a84d2f39664520120a2271 (diff)
downloadorg-mode-16ea0364a4e1c561a9f166586e484b5c1235683c.tar.gz
Call `buffer-substring-no-properties' and remove `org-no-properties'
* org-colview-xemacs.el (org-columns-display-here): Use `buffer-substring-no-properties' and remove `org-no-properties'. * org-colview.el (org-columns-display-here): Ditto. * org-table.el (org-table-eval-formula): Ditto. * org.el (org-entry-properties): Ditto.
-rw-r--r--lisp/org-colview-xemacs.el7
-rw-r--r--lisp/org-colview.el14
-rw-r--r--lisp/org-table.el3
-rw-r--r--lisp/org.el9
4 files changed, 14 insertions, 19 deletions
diff --git a/lisp/org-colview-xemacs.el b/lisp/org-colview-xemacs.el
index 25ad4ca..bfea40d 100644
--- a/lisp/org-colview-xemacs.el
+++ b/lisp/org-colview-xemacs.el
@@ -305,10 +305,9 @@ This is the compiled version of the format.")
(and (looking-at "\\(\\**\\)\\(\\* \\)")
(org-get-level-face 2))))
(item (save-match-data
- (org-no-properties
- (org-remove-tabs
- (buffer-substring-no-properties
- (point-at-bol) (point-at-eol))))))
+ (org-remove-tabs
+ (buffer-substring-no-properties
+ (point-at-bol) (point-at-eol)))))
(color (if (featurep 'xemacs)
(save-excursion
(beginning-of-line 1)
diff --git a/lisp/org-colview.el b/lisp/org-colview.el
index 8da2d1e..21967f2 100644
--- a/lisp/org-colview.el
+++ b/lisp/org-colview.el
@@ -189,15 +189,13 @@ This is the compiled version of the format.")
;; we'll clean it later…
(if (derived-mode-p 'org-mode)
(save-match-data
- (org-no-properties
- (org-remove-tabs
- (buffer-substring-no-properties
- (point-at-bol) (point-at-eol)))))
+ (org-remove-tabs
+ (buffer-substring-no-properties
+ (point-at-bol) (point-at-eol))))
;; In agenda, just get the `txt' property
- (org-no-properties
- (or (org-get-at-bol 'txt)
- (buffer-substring
- (point) (progn (end-of-line) (point)))))))
+ (or (org-get-at-bol 'txt)
+ (buffer-substring-no-properties
+ (point) (progn (end-of-line) (point))))))
(assoc property props))
width (or (cdr (assoc property org-columns-current-maxwidths))
(nth 2 column)
diff --git a/lisp/org-table.el b/lisp/org-table.el
index b3a1c44..eddf482 100644
--- a/lisp/org-table.el
+++ b/lisp/org-table.el
@@ -2501,8 +2501,7 @@ not overwrite the stored one."
(setq orig (or (get-text-property 1 :orig-formula formula) "?"))
(while (> ndown 0)
(setq fields (org-split-string
- (org-no-properties
- (buffer-substring (point-at-bol) (point-at-eol)))
+ (buffer-substring-no-properties (point-at-bol) (point-at-eol))
" *| *"))
;; replace fields with duration values if relevant
(if duration
diff --git a/lisp/org.el b/lisp/org.el
index f605443..f824f89 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -14450,11 +14450,10 @@ things up because then unnecessary parsing is avoided."
(substring (org-match-string-no-properties 1)
0 -1))
string (if (equal key clockstr)
- (org-no-properties
- (org-trim
- (buffer-substring
- (match-beginning 3) (goto-char
- (point-at-eol)))))
+ (org-trim
+ (buffer-substring-no-properties
+ (match-beginning 3) (goto-char
+ (point-at-eol))))
(substring (org-match-string-no-properties 3)
1 -1)))
;; Get the correct property name from the key. This is