aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2012-09-06 17:29:32 +0800
committerChong Yidong2012-09-06 17:29:32 +0800
commit3424a4f61edc1aac5a5a59c2c8f52c8a7139232a (patch)
tree3d37328b7aaadd00221e75bf3ca8831f0a352193
parentc752cfa916879f7415990855b52862dd585242ec (diff)
downloademacs-3424a4f61edc1aac5a5a59c2c8f52c8a7139232a.tar.gz
emacs-3424a4f61edc1aac5a5a59c2c8f52c8a7139232a.zip
* frame.el (window-system-version): Mark as obsolete.
See http://lists.gnu.org/archive/html/emacs-devel/2012-05/msg00412.html
-rw-r--r--etc/NEWS1
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/frame.el4
3 files changed, 9 insertions, 0 deletions
diff --git a/etc/NEWS b/etc/NEWS
index ed59f3264ab..bc1c49fe946 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -695,6 +695,7 @@ by the underlying C implementation.
695 695
696** `automount-dir-prefix' is obsolete. 696** `automount-dir-prefix' is obsolete.
697** `buffer-has-markers-at' is obsolete. 697** `buffer-has-markers-at' is obsolete.
698** `window-system-version' is obsolete.
698 699
699* Changes in Emacs 24.3 on non-free operating systems 700* Changes in Emacs 24.3 on non-free operating systems
700 701
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ccc517973b3..1f5f41c0e35 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12012-09-06 Chong Yidong <cyd@gnu.org>
2
3 * frame.el (window-system-version): Mark as obsolete.
4
12012-09-06 Juri Linkov <juri@jurta.org> 52012-09-06 Juri Linkov <juri@jurta.org>
2 6
3 * replace.el (replace-lax-whitespace): New defcustom. 7 * replace.el (replace-lax-whitespace): New defcustom.
diff --git a/lisp/frame.el b/lisp/frame.el
index 01225639ecf..c182a964820 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -1657,6 +1657,10 @@ terminals, cursor blinking is controlled by the terminal."
1657 1657
1658(make-variable-buffer-local 'show-trailing-whitespace) 1658(make-variable-buffer-local 'show-trailing-whitespace)
1659 1659
1660;; Defined in dispnew.c.
1661(make-obsolete-variable
1662 'window-system-version "it does not give useful information." "24.3")
1663
1660(provide 'frame) 1664(provide 'frame)
1661 1665
1662;;; frame.el ends here 1666;;; frame.el ends here