* lisp/international/mule.el (find-auto-coding): Make "unibyte: t" obsolete.

* etc/NEWS: Edits.

Ref: http://lists.gnu.org/archive/html/emacs-devel/2012-04/msg00434.html

3 files changed, 12 insertions, 1 deletions

diff --git a/etc/NEWS b/etc/NEWS
index baa39db0cb6..768bc229763 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -65,6 +65,9 @@ ImageMagick to view images, set
 frames, if emacsclient is only told to open a new frame without
 specifying any file to visit or expression to evaluate.
 
+** Using "unibyte: t" in Lisp source files is obsolete.
+Using "coding: raw-text" instead.
+
 
 * Editing Changes in Emacs 24.2
 
@@ -128,7 +131,8 @@ see the `apropos' Custom group for details.
 
 ** Calendar
 
-*** The calendars produced by cal-html can optionally include holidays.
+*** The calendars produced by cal-html include holidays.
+Customize cal-html-holidays to change this.
 
 ** Customize
 
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b0a042f0664..db27b30a034 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-05-07  Glenn Morris  <rgm@gnu.org>
+
+        * international/mule.el (find-auto-coding): Make "unibyte: t" obsolete.
+
 2012-05-07  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * loadup.el: Preload newcomment.el.
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index 1f88df52fd4..3257b069787 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -30,6 +30,7 @@
 
 ;;; Code:
 
+;; FIXME?  Are these still relevant?  Nothing uses them AFAICS.
 (defconst mule-version "6.0 (HANACHIRUSATO)" "\
 Version number and name of this version of MULE (multilingual environment).")
 
@@ -1835,6 +1836,8 @@ If nothing is specified, the return value is nil."
                        (re-search-forward
                         "\\(.*;\\)?[ \t]*unibyte:[ \t]*\\([^ ;]+\\)"
                         head-end t))
+              (display-warning 'mule "`unibyte: t' is obsolete; \
+use \"coding: 'raw-text\" instead." :warning)
               (setq coding-system 'raw-text))
             (when (and (not coding-system)
                        (re-search-forward