aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2017-01-30 13:02:18 -0500
committerStefan Monnier2017-01-30 13:02:18 -0500
commitf74d496478cd57f252817bd7437fe1b7972ce01f (patch)
treeeb1bd5143378712483b35d147e2d9f8796d0eae5
parent998e1976acc554a35cb7064b7fc7f3b323a30fe6 (diff)
downloademacs-f74d496478cd57f252817bd7437fe1b7972ce01f.tar.gz
emacs-f74d496478cd57f252817bd7437fe1b7972ce01f.zip
* lisp/subr.el (string-make-unibyte, string-make-multibyte): Obsolete.
-rw-r--r--etc/NEWS1
-rw-r--r--lisp/subr.el2
2 files changed, 3 insertions, 0 deletions
diff --git a/etc/NEWS b/etc/NEWS
index 12ff21f39ae..e368ff84f81 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -738,6 +738,7 @@ instead.
738 738
739* Lisp Changes in Emacs 26.1 739* Lisp Changes in Emacs 26.1
740 740
741** string-(to|as|make)-(uni|multi)byte are now declared obsolete.
741** New variable 'while-no-input-ignore-events' which allow 742** New variable 'while-no-input-ignore-events' which allow
742setting which special events 'while-no-input' should ignore. 743setting which special events 'while-no-input' should ignore.
743It is a list of symbols. 744It is a list of symbols.
diff --git a/lisp/subr.el b/lisp/subr.el
index a6ba05c2021..a204577ddf9 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1417,8 +1417,10 @@ be a list of the form returned by `event-start' and `event-end'."
1417;; bug#23850 1417;; bug#23850
1418(make-obsolete 'string-to-unibyte "use `encode-coding-string'." "26.1") 1418(make-obsolete 'string-to-unibyte "use `encode-coding-string'." "26.1")
1419(make-obsolete 'string-as-unibyte "use `encode-coding-string'." "26.1") 1419(make-obsolete 'string-as-unibyte "use `encode-coding-string'." "26.1")
1420(make-obsolete 'string-make-unibyte "use `encode-coding-string'." "26.1")
1420(make-obsolete 'string-to-multibyte "use `decode-coding-string'." "26.1") 1421(make-obsolete 'string-to-multibyte "use `decode-coding-string'." "26.1")
1421(make-obsolete 'string-as-multibyte "use `decode-coding-string'." "26.1") 1422(make-obsolete 'string-as-multibyte "use `decode-coding-string'." "26.1")
1423(make-obsolete 'string-make-multibyte "use `decode-coding-string'." "26.1")
1422 1424
1423(defun log10 (x) 1425(defun log10 (x)
1424 "Return (log X 10), the log base 10 of X." 1426 "Return (log X 10), the log base 10 of X."