Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-674
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-675
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-676
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-677
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-678
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-679
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-680
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-681
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-682
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-683
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-684
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-685
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-686
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-687
   Release ERC 5.2.

 * emacs@sv.gnu.org/emacs--devo--0--patch-688
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-689
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-690
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-691
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-692
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-693
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-694
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-695
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-696
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-697
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-698
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-699
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-700
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-701
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-209
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-210
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-211
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-212
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-213
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-214
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-215
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-601

1 files changed, 10 insertions, 3 deletions

diff --git a/lisp/emacs-lisp/warnings.el b/lisp/emacs-lisp/warnings.el
index b75f0fd242f..99b0b3f3448 100644
--- a/lisp/emacs-lisp/warnings.el
+++ b/lisp/emacs-lisp/warnings.el
@@ -218,8 +218,9 @@ Default is :warning.
 	      but raise suspicion of a possible problem.
 :debug     -- info for debugging only.
 
-BUFFER-NAME, if specified, is the name of the buffer for logging the
-warning.  By default, it is `*Warnings*'.
+BUFFER-NAME, if specified, is the name of the buffer for logging
+the warning.  By default, it is `*Warnings*'.  If this function
+has to create the buffer, it disables undo in the buffer.
 
 See the `warnings' custom group for user customization features.
 
@@ -227,16 +228,22 @@ See also `warning-series', `warning-prefix-function' and
 `warning-fill-prefix' for additional programming features."
   (unless level
     (setq level :warning))
+  (unless buffer-name
+    (setq buffer-name "*Warnings*"))
   (if (assq level warning-level-aliases)
       (setq level (cdr (assq level warning-level-aliases))))
   (or (< (warning-numeric-level level)
          (warning-numeric-level warning-minimum-log-level))
       (warning-suppress-p type warning-suppress-log-types)
       (let* ((typename (if (consp type) (car type) type))
-	     (buffer (get-buffer-create (or buffer-name "*Warnings*")))
+             (old (get-buffer buffer-name))
+	     (buffer (get-buffer-create buffer-name))
 	     (level-info (assq level warning-levels))
 	     start end)
 	(with-current-buffer buffer
+          ;; If we created the buffer, disable undo.
+          (unless old
+            (setq buffer-undo-list t))
 	  (goto-char (point-max))
 	  (when (and warning-series (symbolp warning-series))
 	    (setq warning-series