(wdired-change-to-wdired-mode, wdired-change-to-dired-mode):

Throw error if buffer is not in Dired and Wdired mode, respectively.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8fd1f8a42550ebc529aad58a734e9ff4136094dc..70a83fc43459efb3f8d13b5b84dd84cbd2a4daa2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-28  Bill Atkins  <atkinw@rpi.edu>  (tiny change)
+
+       * wdired.el (wdired-change-to-wdired-mode, wdired-change-to-dired-mode):
+       Throw error if buffer is not in Dired and Wdired mode, respectively.
+
 2006-07-28  Chong Yidong  <cyd@stupidchicken.com>
 
        * cus-edit.el (custom-no-edit): Revert 2006-07-27 change, so that

diff --git a/lisp/wdired.el b/lisp/wdired.el
index 1363181524c1f2f0754cd18af7cc202b15305bab..bc70e0ddcfd8b6410b57fa74d0b1f95ba6b1fe60 100644 (file)
--- a/lisp/wdired.el
+++ b/lisp/wdired.el
@@ -238,6 +238,8 @@ in disk.
 
 See `wdired-mode'."
   (interactive)
+  (or (eq major-mode 'dired-mode)
+      (error "Not a Dired buffer"))
   (set (make-local-variable 'wdired-old-content)
        (buffer-substring (point-min) (point-max)))
   (set (make-local-variable 'wdired-old-point) (point))
@@ -328,6 +330,8 @@ non-nil means return old filename."
 
 (defun wdired-change-to-dired-mode ()
   "Change the mode back to dired."
+  (or (eq major-mode 'wdired-mode)
+      (error "Not a Wdired buffer"))
   (let ((inhibit-read-only t))
     (remove-text-properties (point-min) (point-max)
                            '(read-only nil local-map nil)))