From: "Sebastian Reuße" <seb@wirrsal.net>
To: emacs-orgmode@gnu.org
Cc: "Sebastian Reuße" <seb@wirrsal.net>
Subject: [PATCH] Fix alphabetic sorting for headlines, tags
Date: Tue, 6 Feb 2018 09:57:16 +0100 [thread overview]
Message-ID: <20180206085716.16913-1-seb@wirrsal.net> (raw)
* org.el (org-sort-entries): Use collated sorting.
(org-tags-sort-function): Use collated sorting.
(org-string-collate-greaterp): Add helper-function to use as defcustom
option, since there is no ‘string-collate-greaterp’ in Emacs.
‘org-sort-entries’ and ‘org-tags-sort-function’ advertise alphabetic
sorting, but actually sort based only on character code. This
produces non-alphabetic orderings of strings in non-ASCII locales.
E. g., German Umlauts “Ä Ü Ö” are alphabetically sorted as if they
were “A U O”, whereas sorting based on character-code will place them
after “Z”, which is unexpected.
---
lisp/org.el | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/lisp/org.el b/lisp/org.el
index 688e48bcc..d54c410b0 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -3558,8 +3558,8 @@ (defcustom org-tags-sort-function nil
:group 'org-tags
:type '(choice
(const :tag "No sorting" nil)
- (const :tag "Alphabetical" string<)
- (const :tag "Reverse alphabetical" string>)
+ (const :tag "Alphabetical" string-collate-lessp)
+ (const :tag "Reverse alphabetical" org-string-collate-greaterp)
(function :tag "Custom function" nil)))
(defvar org-tags-history nil
@@ -8803,7 +8803,7 @@ (defun org-sort-entries
(t (error "Invalid sorting type `%c'" sorting-type))))
nil
(cond
- ((= dcst ?a) 'string<)
+ ((= dcst ?a) 'string-collate-lessp)
((= dcst ?f)
(or compare-func
(and interactive?
@@ -8913,6 +8913,12 @@ (defun org-context-p (&rest contexts)
(org-in-item-p)))
(goto-char pos))))
+(defun org-string-collate-greaterp (s1 s2 &optional locale ignore-case)
+ "Return t if S1 is greater than S2 in collation order.
+
+LOCALE and IGNORE-CASE are handled as in `string-collate-lessp'."
+ (not (string-collate-lessp s1 s2)))
+
;;;###autoload
(defun org-run-like-in-org-mode (cmd)
"Run a command, pretending that the current buffer is in Org mode.
--
2.16.1
next reply other threads:[~2018-02-06 8:58 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-06 8:57 Sebastian Reuße [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-02-06 10:07 [PATCH] Fix alphabetic sorting for headlines, tags Sebastian Reuße
2018-02-10 13:02 ` Nicolas Goaziou
2018-02-11 11:11 ` Sebastian Reuße
2018-02-11 16:25 ` Nicolas Goaziou
2018-02-12 8:44 ` Sebastian Reuße
2018-02-12 14:03 ` Nicolas Goaziou
2018-02-12 14:54 ` Sebastian Reuße
2018-02-12 15:47 ` Nicolas Goaziou
2018-02-12 8:46 ` Sebastian Reuße
2018-02-12 13:59 ` Nicolas Goaziou
2018-02-11 11:13 ` Sebastian Reuße
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180206085716.16913-1-seb@wirrsal.net \
--to=seb@wirrsal.net \
--cc=emacs-orgmode@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).