Merge pull request #81 from gcv/fix-persp-rename-scratch

Rename perspective-specific scratch buffer when perspective is renamed

2 files changed, 16 insertions, 0 deletions

diff --git a/perspective.el b/perspective.el
index b0d0b0d..ad7ea80 100644
--- a/perspective.el
+++ b/perspective.el
@@ -683,6 +683,14 @@ perspective and no others are killed."
   (interactive "sNew name: ")
   (if (gethash name (perspectives-hash))
       (persp-error "Perspective `%s' already exists" name)
+    ;; rename the perspective-specific *scratch* buffer
+    (let* ((old-scratch-name (format "*scratch* (%s)" (persp-name (persp-curr))))
+           (new-scratch-name (format "*scratch* (%s)" name))
+           (scratch-buffer (get-buffer old-scratch-name)))
+      (when scratch-buffer
+        (with-current-buffer scratch-buffer
+          (rename-buffer new-scratch-name))))
+    ;; rewire the rest of the perspective inside its data structures
     (remhash (persp-name (persp-curr)) (perspectives-hash))
     (puthash name (persp-curr) (perspectives-hash))
     (setf (persp-name (persp-curr)) name)
diff --git a/test/test-perspective.el b/test/test-perspective.el
index fddc8fa..5069cb8 100644
--- a/test/test-perspective.el
+++ b/test/test-perspective.el
@@ -245,4 +245,12 @@ persp-test-make-sample-environment."
        (lambda (w) (should-not
                     (memq (window-buffer w) (list A1 A2))))))))
 
+(ert-deftest issue-81-renaming-scratch-buffers ()
+  (persp-test-with-persp
+    (persp-switch "A")
+    (should (get-buffer "*scratch* (A)"))
+    (persp-rename "B")
+    (should (not (get-buffer "*scratch* (A)")))
+    (should (get-buffer "*scratch* (B)"))))
+
 ;;; test-perspective.el ends here