From 40d67a3b0bf7ef48ec8dc3126206d2079f24cc0b Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Mon, 13 Apr 2015 18:21:00 -0400 Subject: [PATCH] * lisp/loadup.el ("cus-start"): Load it after loaddefs.el Fixes: debbugs:20321 * lisp/cus-start.el (read-buffer-function): Don't advertize iswitchb-read-buffer any more. (iswitchb): Don't tweak this obsolete group any more. --- lisp/cus-start.el | 2 -- lisp/loadup.el | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/lisp/cus-start.el b/lisp/cus-start.el index b96b81763ce..05135b80e8e 100644 --- a/lisp/cus-start.el +++ b/lisp/cus-start.el @@ -379,7 +379,6 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of ;; options property set at end (read-buffer-function minibuffer (choice (const nil) - (function-item iswitchb-read-buffer) function)) ;; msdos.c (dos-unsupported-char-glyph display integer) @@ -654,7 +653,6 @@ since it could result in memory overflow and make Emacs crash." ((eq prop :tag) (put symbol 'custom-tag propval)))))))) -(custom-add-to-group 'iswitchb 'read-buffer-function 'custom-variable) (custom-add-to-group 'font-lock 'open-paren-in-column-0-is-defun-start 'custom-variable) diff --git a/lisp/loadup.el b/lisp/loadup.el index 003b0db4abd..51339253ddd 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -103,7 +103,6 @@ (load "bindings") ;; This sets temporary-file-directory, used by eg ;; auto-save-file-name-transforms in files.el. -(load "cus-start") (load "window") ; Needed here for `replace-buffer-in-windows'. (setq load-source-file-function 'load-with-code-conversion) (load "files") @@ -144,6 +143,7 @@ ;; In case loaddefs hasn't been generated yet. (file-error (load "ldefs-boot.el"))) +(load "cus-start") ;After loaddefs to autoload pcase-dolist. (load "emacs-lisp/nadvice") (load "emacs-lisp/cl-preloaded") (load "minibuffer") ;After loaddefs, for define-minor-mode. -- 2.39.2