diff options
author | Case Duckworth | 2021-12-17 18:31:24 -0600 |
---|---|---|
committer | Case Duckworth | 2021-12-17 18:31:24 -0600 |
commit | ccff884113100bf42cb330d8feccbbd4a82d45e6 (patch) | |
tree | f4e7e5a8f4627974585f3a48ea1e449ceff7f23b /lisp | |
parent | Require work stuff (diff) | |
download | emacs-ccff884113100bf42cb330d8feccbbd4a82d45e6.tar.gz emacs-ccff884113100bf42cb330d8feccbbd4a82d45e6.zip |
Bunches o changes
I was gonna try to like, make these atomic, but oops
Diffstat (limited to 'lisp')
-rw-r--r-- | lisp/+browse-url.el | 1 | ||||
-rw-r--r-- | lisp/+circe.el | 7 | ||||
-rw-r--r-- | lisp/+emacs.el | 13 | ||||
-rw-r--r-- | lisp/+modeline.el | 11 | ||||
-rw-r--r-- | lisp/+org.el | 6 | ||||
-rw-r--r-- | lisp/+scratch.el | 2 |
6 files changed, 31 insertions, 9 deletions
diff --git a/lisp/+browse-url.el b/lisp/+browse-url.el index fad0826..d073d50 100644 --- a/lisp/+browse-url.el +++ b/lisp/+browse-url.el | |||
@@ -2,6 +2,7 @@ | |||
2 | 2 | ||
3 | ;;; Code: | 3 | ;;; Code: |
4 | 4 | ||
5 | (require 'browse-url) | ||
5 | (require 'cl-lib) | 6 | (require 'cl-lib) |
6 | 7 | ||
7 | (defgroup +browse-url nil | 8 | (defgroup +browse-url nil |
diff --git a/lisp/+circe.el b/lisp/+circe.el index fc8d0be..7b11ce2 100644 --- a/lisp/+circe.el +++ b/lisp/+circe.el | |||
@@ -86,6 +86,13 @@ message the current topic.") | |||
86 | (with-current-buffer buf | 86 | (with-current-buffer buf |
87 | (+circe-quit@kill-buffer)))) | 87 | (+circe-quit@kill-buffer)))) |
88 | 88 | ||
89 | (defun +circe-quit-all@kill-emacs () | ||
90 | "Quit all circe buffers when killing Emacs." | ||
91 | (ignore-errors | ||
92 | (advice-remove 'circe-command-GQUIT | ||
93 | 'circe-gquit@kill-buffer) | ||
94 | (circe-command-GQUIT "Quitting Emacs, bye!"))) | ||
95 | |||
89 | ;;; Patches | 96 | ;;; Patches |
90 | 97 | ||
91 | (require 'el-patch) | 98 | (require 'el-patch) |
diff --git a/lisp/+emacs.el b/lisp/+emacs.el index a858cf6..15e23da 100644 --- a/lisp/+emacs.el +++ b/lisp/+emacs.el | |||
@@ -101,6 +101,7 @@ Do this only if the buffer is not visiting a file." | |||
101 | show-paren-style 'mixed | 101 | show-paren-style 'mixed |
102 | show-paren-when-point-in-periphery t | 102 | show-paren-when-point-in-periphery t |
103 | show-paren-when-point-inside-paren t | 103 | show-paren-when-point-inside-paren t |
104 | tab-bar-show 1 | ||
104 | tramp-backup-directory-alist backup-directory-alist | 105 | tramp-backup-directory-alist backup-directory-alist |
105 | use-dialog-box nil | 106 | use-dialog-box nil |
106 | use-file-dialog nil | 107 | use-file-dialog nil |
@@ -231,12 +232,12 @@ Do this only if the buffer is not visiting a file." | |||
231 | save-place-forget-unreadable-files (eq system-type 'gnu/linux)) | 232 | save-place-forget-unreadable-files (eq system-type 'gnu/linux)) |
232 | (save-place-mode +1)) | 233 | (save-place-mode +1)) |
233 | 234 | ||
234 | (when (require 'tramp) | 235 | ;; (when (require 'tramp) |
235 | ;; thanks Irreal! https://irreal.org/blog/?p=895 | 236 | ;; ;; thanks Irreal! https://irreal.org/blog/?p=895 |
236 | (add-to-list 'tramp-default-proxies-alist | 237 | ;; (add-to-list 'tramp-default-proxies-alist |
237 | '(nil "\\`root\\'" "/ssh:%h:")) | 238 | ;; '(nil "\\`root\\'" "/ssh:%h:")) |
238 | (add-to-list 'tramp-default-proxies-alist | 239 | ;; (add-to-list 'tramp-default-proxies-alist |
239 | '((regexp-quote (system-name)) nil nil))) | 240 | ;; '((regexp-quote (system-name)) nil nil))) |
240 | 241 | ||
241 | (provide '+emacs) | 242 | (provide '+emacs) |
242 | ;;; +emacs.el ends here | 243 | ;;; +emacs.el ends here |
diff --git a/lisp/+modeline.el b/lisp/+modeline.el index 7c74f76..7615ea7 100644 --- a/lisp/+modeline.el +++ b/lisp/+modeline.el | |||
@@ -20,7 +20,7 @@ | |||
20 | (defun +modeline-buffer-name () ; gonsie | 20 | (defun +modeline-buffer-name () ; gonsie |
21 | "Display the buffer name." | 21 | "Display the buffer name." |
22 | (propertize | 22 | (propertize |
23 | (+string-align (buffer-name) 20 :before " " :ellipsis "… ") | 23 | (+string-align (buffer-name) 20 :before " " :ellipsis "~ ") |
24 | 'face 'bold | 24 | 'face 'bold |
25 | 'help-echo (or (buffer-file-name) | 25 | 'help-echo (or (buffer-file-name) |
26 | (buffer-name)) | 26 | (buffer-name)) |
@@ -49,7 +49,7 @@ | |||
49 | "Display the current `major-mode'." | 49 | "Display the current `major-mode'." |
50 | (concat " " | 50 | (concat " " |
51 | (propertize (+string-truncate (format-mode-line mode-name) | 51 | (propertize (+string-truncate (format-mode-line mode-name) |
52 | 12 "…") | 52 | 12 "~") |
53 | 'face 'bold | 53 | 'face 'bold |
54 | 'keymap mode-line-major-mode-keymap | 54 | 'keymap mode-line-major-mode-keymap |
55 | 'mouse-face 'mode-line-highlight))) | 55 | 'mouse-face 'mode-line-highlight))) |
@@ -108,6 +108,7 @@ The order of elements matters: whichever one matches first is applied." | |||
108 | "mouse-2: widen buffer.") | 108 | "mouse-2: widen buffer.") |
109 | 'local-map (purecopy (simple-modeline-make-mouse-map | 109 | 'local-map (purecopy (simple-modeline-make-mouse-map |
110 | 'mouse-2 'mode-line-widen)) | 110 | 'mouse-2 'mode-line-widen)) |
111 | 'face 'font-lock-doc-face | ||
111 | 'mouse-face 'mode-line-highlight)))) | 112 | 'mouse-face 'mode-line-highlight)))) |
112 | 113 | ||
113 | (define-minor-mode file-percentage-mode | 114 | (define-minor-mode file-percentage-mode |
@@ -161,5 +162,11 @@ The order of elements matters: whichever one matches first is applied." | |||
161 | (format (if (> text-scale-mode-amount 0) " (%+d)" " (%-d)") | 162 | (format (if (> text-scale-mode-amount 0) " (%+d)" " (%-d)") |
162 | text-scale-mode-amount))) | 163 | text-scale-mode-amount))) |
163 | 164 | ||
165 | (defun +modeline-ace-window-display () | ||
166 | "Display `ace-window-display-mode' information in the modeline." | ||
167 | '(+ace-window-display-mode | ||
168 | (ace-window-mode | ||
169 | (" " (:eval (window-parameter (selected-window) 'ace-window-path)))))) | ||
170 | |||
164 | (provide '+modeline) | 171 | (provide '+modeline) |
165 | ;;; +modeline.el ends here | 172 | ;;; +modeline.el ends here |
diff --git a/lisp/+org.el b/lisp/+org.el index 9a91ef1..5631fed 100644 --- a/lisp/+org.el +++ b/lisp/+org.el | |||
@@ -392,5 +392,11 @@ the deletion might narrow the column." | |||
392 | 'face '+org-script-markers))) | 392 | 'face '+org-script-markers))) |
393 | t))) | 393 | t))) |
394 | 394 | ||
395 | ;; Extra link types | ||
396 | |||
397 | (defun +org-tel-open (number _) | ||
398 | "Notify the user of what phone NUMBER to call." | ||
399 | (message "Call: %s" number)) | ||
400 | |||
395 | (provide '+org) | 401 | (provide '+org) |
396 | ;;; +org.el ends here | 402 | ;;; +org.el ends here |
diff --git a/lisp/+scratch.el b/lisp/+scratch.el index 976b08c..2a89a95 100644 --- a/lisp/+scratch.el +++ b/lisp/+scratch.el | |||
@@ -2,7 +2,7 @@ | |||
2 | 2 | ||
3 | ;;; Code: | 3 | ;;; Code: |
4 | 4 | ||
5 | (require 'scratch) | 5 | ;;(require 'scratch) |
6 | 6 | ||
7 | (defun +scratch-immortal () | 7 | (defun +scratch-immortal () |
8 | "Bury, don't kill \"*scratc*\" buffer. | 8 | "Bury, don't kill \"*scratc*\" buffer. |