Merge branch 'master' of elephly.net:/srv/repos/software/emacs

Conflicts:
	lisp/init-magit.el

1 files changed, 4 insertions, 0 deletions

diff --git a/init.el b/init.el
index c71ce23..f5e5ae6 100644
--- a/init.el
+++ b/init.el
@@ -209,6 +209,10 @@
 (global-hl-line-mode 1) ; turn on highlighting current line
 (set-face-background 'hl-line "#222")
 (set-face-attribute hl-line-face nil :underline nil)
+
+;; don't let the cursor go into minibuffer prompt, HT Xah Lee
+(setq minibuffer-prompt-properties '(read-only t point-entered minibuffer-avoid-prompt face minibuffer-prompt))
+
 (global-undo-tree-mode 1)
 
 (setq debbugs-gnu-default-packages '("emacs" "guix"))