Remove CVS merge cookie left in.
[emacs.git] / lisp / hscroll.el
blob85565be871165a5c5519bad777792765442b574b
1 ;;; hscroll.el --- automatically scroll truncated lines horizontally
2 ;;; Copyright (C) 1992, 1993, 1995, 1996 Free Software Foundation, Inc.
4 ;; Author: Wayne Mesard <wmesard@esd.sgi.com>
5 ;; Keywords: display
7 ;; This file is part of GNU Emacs.
9 ;; GNU Emacs is free software; you can redistribute it and/or modify
10 ;; it under the terms of the GNU General Public License as published by
11 ;; the Free Software Foundation; either version 2, or (at your option)
12 ;; any later version.
14 ;; GNU Emacs is distributed in the hope that it will be useful,
15 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
16 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17 ;; GNU General Public License for more details.
19 ;; You should have received a copy of the GNU General Public License
20 ;; along with GNU Emacs; see the file COPYING. If not, write to the
21 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
22 ;; Boston, MA 02111-1307, USA.
24 ;;; Commentary:
26 ;; This file contains dummy variables and functions only because Emacs
27 ;; does hscrolling automatically, now.
29 ;;; Code:
31 ;;;
32 ;;; PUBLIC VARIABLES
33 ;;;
35 (defvar hscroll-version "0.0")
37 (defgroup hscroll nil
38 "This customization group is kept for compatibility only.
39 Emacs now does hscrolling automatically. Please remove references
40 to hscroll from your init file and code."
41 :group 'editing)
44 (defcustom hscroll-global-mode nil
45 "*Obsolete."
46 :group 'hscroll
47 :type 'boolean
48 :require 'hscroll
49 :version "20.3")
51 (defcustom hscroll-margin 5
52 "*Obsolete."
53 :group 'hscroll
54 :type 'integer)
56 (defcustom hscroll-snap-threshold 30
57 "*Obsolete."
58 :group 'hscroll
59 :type 'integer)
61 (defcustom hscroll-step-percent 25
62 "*Obsolete."
63 :group 'hscroll
64 :type 'integer)
66 (defcustom hscroll-mode-name " Hscr"
67 "*Obsolete."
68 :group 'hscroll
69 :type 'string)
71 ;;;
72 ;;; PUBLIC COMMANDS
73 ;;;
75 ;;;###autoload
76 (defun turn-on-hscroll ()
77 "This function is obsolete.")
79 ;;;###autoload
80 (defun hscroll-mode (&optional arg)
81 "This function is absolete."
82 (interactive "P"))
84 ;;;###autoload
85 (defun hscroll-global-mode (&optional arg)
86 "This function is absolete."
87 (interactive "P"))
89 (defun hscroll-window-maybe ()
90 "This function is obsolete."
91 (interactive))
93 (provide 'hscroll)
95 ;;; hscroll.el ends here