Merge pull request #851 from RadicalZephyr/advice->hook

Reopen file as root: advice -> hook
This commit is contained in:
Bozhidar Batsov 2015-05-16 22:59:25 +03:00
commit 1a8b4ebd47

View file

@ -285,6 +285,10 @@ there's a region, all lines that region covers will be duplicated."
(interactive) (interactive)
(byte-recompile-directory prelude-dir 0)) (byte-recompile-directory prelude-dir 0))
(defun prelude-find-alternate-file-as-root (filename)
"Wraps `find-alternate-file' with opening a file as root."
(find-alternate-file (concat "/sudo:root@localhost:" filename)))
(require 'ido) (require 'ido)
(defun prelude-sudo-edit (&optional arg) (defun prelude-sudo-edit (&optional arg)
"Edit currently visited file as root. "Edit currently visited file as root.
@ -296,15 +300,16 @@ buffer is not visiting a file."
(if (or arg (not buffer-file-name)) (if (or arg (not buffer-file-name))
(find-file (concat "/sudo:root@localhost:" (find-file (concat "/sudo:root@localhost:"
(ido-read-file-name "Find file(as root): "))) (ido-read-file-name "Find file(as root): ")))
(find-alternate-file (concat "/sudo:root@localhost:" buffer-file-name)))) (prelude-find-alternate-file-as-root buffer-file-name)))
(defadvice ido-find-file (after find-file-sudo activate) (defun prelude-reopen-as-root ()
"Find file as root if necessary." "Find file as root if necessary."
(unless (or (tramp-tramp-file-p buffer-file-name) (unless (or (tramp-tramp-file-p buffer-file-name)
(equal major-mode 'dired-mode) (equal major-mode 'dired-mode)
(not (file-exists-p (file-name-directory buffer-file-name))) (not (file-exists-p (file-name-directory buffer-file-name)))
(file-writable-p buffer-file-name)) (file-writable-p buffer-file-name))
(find-alternate-file (concat "/sudo:root@localhost:" buffer-file-name)))) (prelude-find-alternate-file-as-root buffer-file-name)))
(add-hook 'find-file-hook 'prelude-reopen-as-root)
(defun prelude-start-or-switch-to (function buffer-name) (defun prelude-start-or-switch-to (function buffer-name)
"Invoke FUNCTION if there is no buffer with BUFFER-NAME. "Invoke FUNCTION if there is no buffer with BUFFER-NAME.