X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/5a29709b2dc76bc1753b4be5656414c39d5b057a..52ffecb1e30140d89c6cf8de707dbb300d5c82e4:/el/dot-emacs.el?ds=sidebyside

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index 0c402be..34df1a0 100644
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -588,6 +588,34 @@ Even if an existing window in some random frame looks tempting."
 Pretend they don't exist.  They might be on other display devices."
   (ad-set-arg 2 nil))
 
+;; Rename buffers along with files.
+
+(defvar mdw-inhibit-rename-buffer nil
+  "If non-nil, `rename-file' won't rename the buffer visiting the file.")
+
+(defmacro mdw-advise-to-inhibit-rename-buffer (function)
+  "Advise FUNCTION to set `mdw-inhibit-rename-buffer' while it runs.
+
+This will prevent `rename-file' from renaming the buffer."
+  `(defadvice ,function (around mdw-inhibit-rename-buffer compile activate)
+     "Don't rename the buffer when renaming the underlying file."
+     (let ((mdw-inhibit-rename-buffer t))
+       ad-do-it)))
+(mdw-advise-to-inhibit-rename-buffer recode-file-name)
+(mdw-advise-to-inhibit-rename-buffer set-visited-file-name)
+(mdw-advise-to-inhibit-rename-buffer backup-buffer)
+
+(defadvice rename-file (after mdw-rename-buffers (from to &optional forcep)
+			compile activate)
+  "If a buffer is visiting the file, rename it to match the new name.
+
+Don't do this if `mdw-inhibit-rename-buffer' is non-nil."
+  (unless mdw-inhibit-rename-buffer
+    (let ((buffer (get-file-buffer from)))
+      (when buffer
+	(with-current-buffer buffer
+	  (set-visited-file-name to nil t))))))
+
 ;;;--------------------------------------------------------------------------
 ;;; Improved compilation machinery.