* lisp/emacs-lisp/bytecomp.el (byte-compile-disable-print-circle): Obsolete.

6 files changed, 13 insertions, 8 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 217f5ab1d70..cfb788940d0 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -712,6 +712,7 @@ sc.el, x-menu.el, rnews.el, rnewspost.el
 
 * Lisp changes in Emacs 24.1
 
+** byte-compile-disable-print-circle is obsolete.
 ** Removed the stack-trace-on-error variable.
 Also the debugger can now "continue" from an error, which means it will jump
 to the error handler as if the debugger had not been invoked instead of
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index fceeaba174c..2c98cdf59a6 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -611,7 +611,7 @@
 	autoconf, not cpp.
 	(ALL_CFLAGS): Use them as make variables.
 
-2010-04-07  Christoph  <cschol2112@googlemail.com>  (tiny change)
+2010-04-07  Christoph Scholtes  <cschol2112@googlemail.com>
 
 	* makefile.w32-in (OTHER_PLATFORM_SUPPORT): Use parenthesis
 	for macros for nmake compatibility.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index df3098332f9..33f39c00a60 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2011-02-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* emacs-lisp/bytecomp.el (byte-compile-disable-print-circle): Obsolete.
+
 2011-02-23  Kenichi Handa  <handa@m17n.org>
 
 	* mail/rmailmm.el (rmail-mime-process-multipart): Do not signal an
@@ -9055,7 +9059,7 @@
 	* htmlfontify.el (hfy-face-attr-for-class): Use append instead
 	of nconc to avoid pure storage error (Bug#6239).
 
-2010-06-27  Christoph  <cschol2112@googlemail.com>  (tiny change)
+2010-06-27  Christoph Scholtes  <cschol2112@googlemail.com>
 
 	* bookmark.el (bookmark-bmenu-2-window, bookmark-bmenu-other-window)
 	(bookmark-bmenu-other-window-with-mouse): Remove unnecessary
@@ -11238,7 +11242,7 @@
 
 	* ido.el (ido-file-internal): Fix 2009-12-02 change.
 
-2010-04-19  Christoph  <cschol2112@googlemail.com>  (tiny change)
+2010-04-19  Christoph Scholtes  <cschol2112@googlemail.com>
 
 	* progmodes/grep.el (grep-compute-defaults): Fix handling of host
 	default settings (Bug#5928).
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 199927d536e..2f113dfb479 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -227,6 +227,7 @@ the functions you loaded will not be able to run.")
 
 (defvar byte-compile-disable-print-circle nil
   "If non-nil, disable `print-circle' on printing a byte-compiled code.")
+(make-obsolete-variable 'byte-compile-disable-print-circle nil "24.1")
 ;;;###autoload(put 'byte-compile-disable-print-circle 'safe-local-variable 'booleanp)
 
 (defcustom byte-compile-dynamic-docstrings t
diff --git a/lisp/international/ja-dic-cnv.el b/lisp/international/ja-dic-cnv.el
index 7e317ea09c0..c0fcf19d841 100644
--- a/lisp/international/ja-dic-cnv.el
+++ b/lisp/international/ja-dic-cnv.el
@@ -337,7 +337,7 @@ The name of generated file is specified by the variable `ja-dic-filename'."
       (erase-buffer)
       (buffer-disable-undo)
       (insert ";;; ja-dic.el --- dictionary for Japanese input method"
-	      " -*-coding: euc-japan; byte-compile-disable-print-circle:t; -*-\n"
+	      " -*-coding: euc-japan; -*-\n"
 	      ";;\tGenerated by the command `skkdic-convert'\n"
 	      ";;\tDate: " (current-time-string) "\n"
 	      ";;\tOriginal SKK dictionary file: "
diff --git a/lisp/international/titdic-cnv.el b/lisp/international/titdic-cnv.el
index 935d66c613b..e68dc8bdc17 100644
--- a/lisp/international/titdic-cnv.el
+++ b/lisp/international/titdic-cnv.el
@@ -272,8 +272,7 @@ SPC, 6, 3, 4, or 7 specifing a tone (SPC:$(0?v(N(B, 6:$(0Dm(N(B, 3:$(0&9Vy
 
     (princ ";; Quail package `")
     (princ package)
-    (princ (format "' -*- coding:%s; " coding-system-for-write))
-    (princ "byte-compile-disable-print-circle:t; -*-\n")
+    (princ (format "' -*- coding:%s -*-\n" coding-system-for-write))
     (princ ";;   Generated by the command `titdic-convert'\n;;\tDate: ")
     (princ (current-time-string))
     (princ "\n;;\tOriginal TIT dictionary file: ")
@@ -1154,8 +1153,8 @@ the generated Quail package is saved."
 	(setq coding-system-for-write
 	      (coding-system-change-eol-conversion coding 'unix))
 	(with-temp-file (expand-file-name quailfile dirname)
-	  (insert (format ";; Quail package `%s' -*- coding:%s; " name coding))
-	  (insert "byte-compile-disable-print-circle:t; -*-\n")
+	  (insert (format ";; Quail package `%s' -*- coding:%s -*-\n"
+                          name coding))
 	  (insert ";;   Generated by the command `miscdic-convert'\n")
 	  (insert ";;   Date: " (current-time-string) "\n")
 	  (insert ";;   Source dictionary file: " dicfile "\n")