2 files changed, 15 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 653822a86fd..ccc0531778a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-14  Kan-Ru Chen  <kanru@kanru.info>  (tiny change)
+
+        * textmodes/nroff-mode.el (nroff-view): Kill old buffer before
+        refreshing the preview buffer.
+
 2010-09-18  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * textmodes/tex-mode.el (tex-syntax-propertize-rules)
diff --git a/lisp/textmodes/nroff-mode.el b/lisp/textmodes/nroff-mode.el
index 14b0b106bb3..52538064053 100644
--- a/lisp/textmodes/nroff-mode.el
+++ b/lisp/textmodes/nroff-mode.el
@@ -311,10 +311,16 @@ turns it on if arg is positive, otherwise off."
   "Run man on this file."
   (interactive)
   (require 'man)
-  (let* ((file (buffer-file-name)))
-    (if file
-        (Man-getpage-in-background file)
-      (error "No associated file for the current buffer"))))
+  (let* ((file (buffer-file-name))
+         (viewbuf (get-buffer (concat "*Man " file "*"))))
+    (unless file
+      (error "Buffer is not associated with any file"))
+    (and (buffer-modified-p)
+         (y-or-n-p (format "Save buffer %s first? " (buffer-name)))
+         (save-buffer))
+    (if viewbuf
+        (kill-buffer viewbuf))
+    (Man-getpage-in-background file)))
 
 ;; Old names that were not namespace clean.
 (define-obsolete-function-alias 'count-text-lines 'nroff-count-text-lines "22.1")