From 94ee8db5e0a8bfa2aa68859782960b7140dae935 Mon Sep 17 00:00:00 2001
From: Glenn Morris <rgm@gnu.org>
Date: Mon, 16 Apr 2012 14:41:38 -0400
Subject: [PATCH] * lisp/frame.el (automatic-hscrolling): Make this alias
 obsolete.

---
 lisp/ChangeLog | 4 ++++
 lisp/frame.el  | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a0f42ba6ff7..97d626f9505 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-04-16  Glenn Morris  <rgm@gnu.org>
+
+	* frame.el (automatic-hscrolling): Make this alias obsolete.
+
 2012-04-12  Agustín Martín Domingo  <agustin.martin@hispalinux.es>
 
 	* ispell.el (ispell-set-spellchecker-params): Post-process
diff --git a/lisp/frame.el b/lisp/frame.el
index 79e1243c7af..1ee9d966ef1 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -1651,7 +1651,8 @@ terminals, cursor blinking is controlled by the terminal."
 
 ;; Misc.
 
-(defvaralias 'automatic-hscrolling 'auto-hscroll-mode)
+;; Only marked as obsolete in 24.2.
+(define-obsolete-variable-alias 'automatic-hscrolling 'auto-hscroll-mode "22.1")
 
 (make-variable-buffer-local 'show-trailing-whitespace)
 
-- 
2.39.2