Merge branch 'main' of tildegit.org:acdw/emacs

2 files changed, 36 insertions, 0 deletions

@@ -301,6 +301,7 @@
    (when (boundp 'erc-autojoin-channels-alist)
      (mapcar #'car erc-autojoin-channels-alist))
    erc-server-coding-system '(utf-8 . utf-8)
+   erc-timestamp-intangible t
    erc-track-exclude-types (append erc-hide-list
                                    '("AWAY"
                                      "353" "324" "329" "332" "333" "477"))
@@ -828,6 +829,10 @@ like a dumbass."
    set-mark-command-repeat-pop t
    )
 
+  (when (fboundp 'command-completion-default-include-p)
+    (setq read-extended-command-predicate
+          #'command-completion-default-include-p))
+
   (:global "M-=" count-words
            "C-w" kill-region-or-backward-word
            "<help> h" nil ; HELLO takes a long time to load on Windows
@@ -535,5 +535,36 @@ It's called 'require-private' for historical reasons."
       (when (fboundp mode)
         (funcall mode -1)))))
 
+
+;;; Sort setq...
+;; https://emacs.stackexchange.com/questions/33039/
+
+(defun sort-setq ()
+  (interactive)
+  (save-excursion
+    (save-restriction
+      (let ((sort-end (progn (end-of-defun)
+                             (backward-char)
+                             (point-marker)))
+            (sort-beg (progn (beginning-of-defun)
+                             (re-search-forward "[ \\t]*(" (point-at-eol))
+                             (forward-sexp)
+                             (re-search-forward "\\<" (point-at-eol))
+                             (point-marker))))
+        (narrow-to-region (1- sort-beg) (1+ sort-end))
+        (sort-subr nil #'sort-setq-next-record #'sort-setq-end-record)))))
+
+(defun sort-setq-next-record ()
+  (condition-case nil
+      (progn
+        (forward-sexp 1)
+        (backward-sexp))
+    ('scan-error (end-of-buffer))))
+
+(defun sort-setq-end-record ()
+  (condition-case nil
+      (forward-sexp 2)
+    ('scan-error (end-of-buffer))))
+
 (provide 'acdw)
 ;;; acdw.el ends here