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

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
This commit is contained in:
Bozhidar Batsov 2013-04-29 08:00:29 +03:00
commit 4c1b6b9dea

View file

@ -264,8 +264,9 @@ buffer is not visiting a file."
(defadvice ido-find-file (after find-file-sudo activate) (defadvice ido-find-file (after find-file-sudo activate)
"Find file as root if necessary." "Find file as root if necessary."
(unless (and buffer-file-name (unless (or (equal major-mode 'dired-mode)
(file-writable-p buffer-file-name)) (and (buffer-file-name)
(file-writable-p buffer-file-name)))
(find-alternate-file (concat "/sudo:root@localhost:" buffer-file-name)))) (find-alternate-file (concat "/sudo:root@localhost:" buffer-file-name))))
(defun prelude-start-or-switch-to (function buffer-name) (defun prelude-start-or-switch-to (function buffer-name)