jt/emacs-prelude
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:bbatsov/prelude

Browse source
This commit is contained in:
Bozhidar Batsov 2014-08-12 12:54:54 +03:00
commit e20088d581
6 changed files with 46 additions and 18 deletions

22
core/prelude-core.el
View file

@ -266,8 +266,11 @@ there's a region, all lines that region covers will be duplicated."
(url (read-from-minibuffer "URL: " default)))
(switch-to-buffer (url-retrieve-synchronously url))
(rename-buffer url t)
(cond ((search-forward "<?xml" nil t) (nxml-mode))
((search-forward "<html" nil t) (html-mode)))))
(goto-char (point-min))
(re-search-forward "^$")
(delete-region (point-min) (point))
(delete-blank-lines)
(set-auto-mode)))
(defun prelude-cleanup-buffer-or-region ()
"Cleanup a region if selected, otherwise the whole buffer."
@ -303,11 +306,10 @@ buffer is not visiting a file."
(defadvice ido-find-file (after find-file-sudo activate)
"Find file as root if necessary."
(unless (or (equal major-mode 'dired-mode)
(and (buffer-file-name)
(not (file-exists-p (file-name-directory (buffer-file-name)))))
(and (buffer-file-name)
(file-writable-p buffer-file-name)))
(unless (or (tramp-tramp-file-p buffer-file-name)
(equal major-mode 'dired-mode)
(not (file-exists-p (file-name-directory buffer-file-name)))
(file-writable-p buffer-file-name))
(find-alternate-file (concat "/sudo:root@localhost:" buffer-file-name))))
(defun prelude-start-or-switch-to (function buffer-name)
@ -371,9 +373,9 @@ Doesn't mess with special buffers."
(defun prelude-create-scratch-buffer ()
"Create a new scratch buffer."
(interactive)
(let ((buf (get-buffer-create (generate-new-buffer-name "*scratch*"))))
(set-buffer-major-mode buf)
(switch-to-buffer buf)))
(let ((buf (generate-new-buffer "*scratch*")))
(switch-to-buffer buf)
(funcall initial-major-mode)))
(defvar prelude-tips
'("Press <C-c o> to open a file with external program."