diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-04-17 14:38:34 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-04-17 14:38:34 -0700 |
| commit | ae6e112df045de8ddc22e85f8538975d4664b325 (patch) | |
| tree | 3923d0ff634b043c69f87255b52619d195dfc6ad /lisp/frame.el | |
| parent | ad85a071cc6d583041969d300793c92f21a54696 (diff) | |
| parent | 197b6f3c605872bfeb7b2024d255142d8f579021 (diff) | |
| download | emacs-ae6e112df045de8ddc22e85f8538975d4664b325.tar.gz | |
Merge from trunk.
Diffstat (limited to 'lisp/frame.el')
| -rw-r--r-- | lisp/frame.el | 3 |
1 files changed, 2 insertions, 1 deletions
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) |