summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2017-10-17 09:37:34 +0200
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2017-10-17 09:37:34 +0200
commit45a1918efe8876ec33e7912a84f2fb8600466c1d (patch)
tree75b7dbc6f5d1ef2e6db1eb408689488484c45a09
parent5b2b8f3175b2a601d6f9c06a82bb576f70b5636c (diff)
downloadorg-mode-45a1918efe8876ec33e7912a84f2fb8600466c1d.tar.gz
Move `org-xor' into "org-macs.el"
* lisp/org.el (org-xor): Move... * lisp/org-macs.el: ... there.
-rw-r--r--lisp/org-macs.el8
-rw-r--r--lisp/org.el4
2 files changed, 8 insertions, 4 deletions
diff --git a/lisp/org-macs.el b/lisp/org-macs.el
index d0005d7..1a2d8a4 100644
--- a/lisp/org-macs.el
+++ b/lisp/org-macs.el
@@ -168,6 +168,14 @@ point nowhere."
+;;; Logic
+
+(defsubst org-xor (a b)
+ "Exclusive `or'."
+ (if a (not b) b))
+
+
+
;;; String manipulation
(defsubst org-trim (s &optional keep-lead)
diff --git a/lisp/org.el b/lisp/org.el
index 4529924..e3b4cce 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -10020,10 +10020,6 @@ Note: this function also decodes single byte encodings like
(char-to-string (string-to-number byte 16)))
(cdr (split-string hex "%")) ""))
-(defun org-xor (a b)
- "Exclusive or."
- (if a (not b) b))
-
(defun org-fixup-message-id-for-http (s)
"Replace special characters in a message id, so it can be used in an http query."
(when (string-match "%" s)