ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix alphabetic string matching operators 

* org.el (org-string<): Add.
(org-op-to-function): Use it.
(org-string> etc.): Use collated comparison.

Cf. commit 551d2f1fe.
This commit is contained in:
Sebastian Reuße 2018-03-11 17:09:32 +01:00 committed by Nicolas Goaziou
parent e64ff15f67
commit 0d6ee386a1
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lisp/org.el
View File

@ -14045,7 +14045,7 @@ When DOWNCASE is non-nil, expand downcased TAGS."
"Turn an operator into the appropriate function." "Turn an operator into the appropriate function."
(setq op (setq op
(cond (cond
((equal op "<" ) '(< string< org-time<)) ((equal op "<" ) '(< org-string< org-time<))
((equal op ">" ) '(> org-string> org-time>)) ((equal op ">" ) '(> org-string> org-time>))
((member op '("<=" "=<")) '(<= org-string<= org-time<=)) ((member op '("<=" "=<")) '(<= org-string<= org-time<=))
((member op '(">=" "=>")) '(>= org-string>= org-time>=)) ((member op '(">=" "=>")) '(>= org-string>= org-time>=))
@ -14054,9 +14054,10 @@ When DOWNCASE is non-nil, expand downcased TAGS."
(nth (if (eq stringp 'time) 2 (if stringp 1 0)) op)) (nth (if (eq stringp 'time) 2 (if stringp 1 0)) op))
(defun org<> (a b) (not (= a b))) (defun org<> (a b) (not (= a b)))
(defun org-string<= (a b) (or (string= a b) (string< a b))) (defun org-string< (a b) (org-string-collate-lessp a b))
(defun org-string>= (a b) (not (string< a b))) (defun org-string<= (a b) (or (string= a b) (org-string-collate-lessp a b)))
(defun org-string> (a b) (and (not (string= a b)) (not (string< a b)))) (defun org-string>= (a b) (not (org-string-collate-lessp a b)))
(defun org-string> (a b) (and (not (string= a b)) (not (org-string-collate-lessp a b))))
(defun org-string<> (a b) (not (string= a b))) (defun org-string<> (a b) (not (string= a b)))
(defun org-time= (a b) (setq a (org-2ft a) b (org-2ft b)) (and (> a 0) (> b 0) (= a b))) (defun org-time= (a b) (setq a (org-2ft a) b (org-2ft b)) (and (> a 0) (> b 0) (= a b)))
(defun org-time< (a b) (setq a (org-2ft a) b (org-2ft b)) (and (> a 0) (> b 0) (< a b))) (defun org-time< (a b) (setq a (org-2ft a) b (org-2ft b)) (and (> a 0) (> b 0) (< a b)))