* lisp/emacs-lisp/cl-macs.el (cl-expr-contains): Handle cons cells

[gnu-emacs] / lisp / emacs-lisp / trace.el

diff --git a/lisp/emacs-lisp/trace.el b/lisp/emacs-lisp/trace.el
index f474e8c72d5c84253d6524b020bbbc3cd3f87b1f..fd66c9364f27e796e930fdd0cc1d505284046b1f 100644 (file)
--- a/lisp/emacs-lisp/trace.el
+++ b/lisp/emacs-lisp/trace.el
@@ -1,7 +1,6 @@
 ;;; trace.el --- tracing facility for Emacs Lisp functions
 
-;; Copyright (C) 1993, 1998, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1998, 2000-2012 Free Software Foundation, Inc.
 
 ;; Author: Hans Chalupsky <hans@cs.buffalo.edu>
 ;; Maintainer: FSF
@@ -160,8 +159,8 @@
   :group 'lisp)
 
 ;;;###autoload
-(defcustom trace-buffer "*trace-output*"
-  "*Trace output will by default go to that buffer."
+(defcustom trace-buffer (purecopy "*trace-output*")
+  "Trace output will by default go to that buffer."
   :type 'string
   :group 'trace)
 
@@ -253,7 +252,7 @@
 For every call of FUNCTION Lisp-style trace messages that display argument
 and return values will be inserted into BUFFER.  This function generates the
 trace advice for FUNCTION and activates it together with any other advice
-there might be!! The trace BUFFER will popup whenever FUNCTION is called.
+there might be!!  The trace BUFFER will popup whenever FUNCTION is called.
 Do not use this to trace functions that switch buffers or do any other
 display oriented stuff, use `trace-function-background' instead."
   (interactive
@@ -299,5 +298,4 @@ was not traced this is a noop."
 
 (provide 'trace)
 
-;; arch-tag: cfd170a7-4932-4331-8c8b-b7151942e5a1
 ;;; trace.el ends here