summaryrefslogtreecommitdiffstats
path: root/emacs
diff options
context:
space:
mode:
authorGravatar Tom Willemse2015-12-17 01:07:45 +0100
committerGravatar Tom Willemse2015-12-17 01:07:45 +0100
commitbc52f7560902e05535a936743d51654434b7e8d0 (patch)
tree1abc70f33fb29678adbe1df528f44a3c7d2e822d /emacs
parentcc4b99f7fce7e74de996e55571aaa5106672d32e (diff)
downloaddotfiles-bc52f7560902e05535a936743d51654434b7e8d0.tar.gz
dotfiles-bc52f7560902e05535a936743d51654434b7e8d0.zip
Move eshell-handle-url to eshell library
Diffstat (limited to 'emacs')
-rw-r--r--emacs/.emacs.d/init.el11
-rw-r--r--emacs/.emacs.d/site-lisp/oni-eshell.el15
2 files changed, 14 insertions, 12 deletions
diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index b2ae0ea..7978a21 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -148,15 +148,6 @@ MODE1 is enabled and vice-versa."
"Set the `disabled' property for each item in FUNCTIONS to nil."
(mapc #'(lambda (f) (put f 'disabled nil)) functions))
-(defun oni:eshell-handle-url ()
- (save-excursion
- (goto-char eshell-last-output-start)
- (while (re-search-forward
- "https?://[^ \n]+" eshell-last-output-end :noerror)
- (make-button (match-beginning 0) (match-end 0)
- 'action (lambda (button)
- (browse-url (button-label button)))))))
-
(defun oni:go-mode-func ()
"Function for `go-mode-hook'."
(setq indent-tabs-mode nil))
@@ -774,7 +765,7 @@ If no direction is given, don't split."
(setq emms-player-mpd-music-directory "/mnt/music/mp3"))
(stante-after esh-mode
- (add-to-list 'eshell-output-filter-functions #'oni:eshell-handle-url)
+ (add-to-list 'eshell-output-filter-functions 'oni:eshell-buttonize-url)
(add-to-list 'eshell-output-filter-functions #'eshell-truncate-buffer))
(stante-after eww
diff --git a/emacs/.emacs.d/site-lisp/oni-eshell.el b/emacs/.emacs.d/site-lisp/oni-eshell.el
index 02d49a0..c0d3d13 100644
--- a/emacs/.emacs.d/site-lisp/oni-eshell.el
+++ b/emacs/.emacs.d/site-lisp/oni-eshell.el
@@ -1,4 +1,4 @@
-;;; oni-eshell.el --- Extra Eshell commands -*- lexical-binding: t; -*-
+;;; oni-eshell.el --- Extra Eshell commands and functions -*- lexical-binding: t; -*-
;; Copyright (C) 2015 Tom Willemse
@@ -20,7 +20,7 @@
;;; Commentary:
-;; Here are some extra commands for eshell.
+;; Here are some extra commands and functions for eshell.
;;; Code:
@@ -38,5 +38,16 @@ directory in it."
(eshell/cd project-dir)
(error "Can't locate project root"))))
+;;;###autoload
+(defun oni:eshell-buttonize-url ()
+ "Turn every URL into a clickable button."
+ (save-excursion
+ (goto-char eshell-last-output-start)
+ (while (re-search-forward
+ "https?://[^ \n]+" eshell-last-output-end :noerror)
+ (make-button (match-beginning 0) (match-end 0)
+ 'action (lambda (button)
+ (browse-url (button-label button)))))))
+
(provide 'oni-eshell)
;;; oni-eshell.el ends here