Mercurial > emacs
view lisp/obsolete/hscroll.el @ 89970:a849e5779b8c
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-35
Fix damage caused by trunk merge in emacs--unicode--0--patch-15
Some files in the emacs--cvs-trunk--0 branch had their arch id-tag changed
from tagline to explicit [because they were used as template files, and their
syntax didn't accommodate stripping comments, so the the generated files
caused id-tag conflicts when an in-tree build was done].
Unfortunately arch doesn't handle id-tag changes well, so this resulted in
the files appearing to be deleted, and then added again. When that changeset
was merged into the unicode branch, it resulted in unicode-specific changes
being dropped, and the trunk version being added.
To fix this, I restored these files to their pre-merge versions (from
emacs--unicode--0--patch-14), and then manually reapplied all changes from:
(1) the unicode branch from the bogus merge point to the current version
(emacs--unicode--0--patch-15 - emacs--unicode--0--patch-34)
(2) the trunk from the bogus merge point to the latest version which was
merged into the unicode branch
(emacs--cvs-trunk--0--patch-218 - emacs--cvs-trunk--0--patch-522)
and fixed any conflicts (mostly due to doubly-applied patch hunks that patch
couldn't detect).
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sun, 05 Sep 2004 01:53:47 +0000 |
parents | 68c22ea6027c |
children | f9a65d7ebd29 |
line wrap: on
line source
;;; hscroll.el --- automatically scroll truncated lines horizontally ;;; Copyright (C) 1992, 1993, 1995, 1996 Free Software Foundation, Inc. ;; Author: Wayne Mesard <wmesard@esd.sgi.com> ;; Keywords: display ;; This file is part of GNU Emacs. ;; GNU Emacs is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by ;; the Free Software Foundation; either version 2, or (at your option) ;; any later version. ;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;;; Commentary: ;; ;; This file contains dummy variables and functions only because Emacs ;; does hscrolling automatically, now. ;;; Code: ;;; ;;; PUBLIC VARIABLES ;;; (defvar hscroll-version "0.0") (defgroup hscroll nil "This customization group is kept for compatibility only. Emacs now does hscrolling automatically. Please remove references to hscroll from your init file and code." :group 'editing) (defcustom hscroll-global-mode nil "*Obsolete." :group 'hscroll :type 'boolean :require 'hscroll :version "20.3") (defcustom hscroll-margin 5 "*Obsolete." :group 'hscroll :type 'integer) (defcustom hscroll-snap-threshold 30 "*Obsolete." :group 'hscroll :type 'integer) (defcustom hscroll-step-percent 25 "*Obsolete." :group 'hscroll :type 'integer) (defcustom hscroll-mode-name " Hscr" "*Obsolete." :group 'hscroll :type 'string) ;;; ;;; PUBLIC COMMANDS ;;; ;;;###autoload (defun turn-on-hscroll () "This function is obsolete. Emacs now does hscrolling automatically, if `truncate-lines' is non-nil. Also see `automatic-hscrolling'.") ;;;###autoload (defun hscroll-mode (&optional arg) "This function is obsolete. Emacs now does hscrolling automatically, if `truncate-lines' is non-nil. Also see `automatic-hscrolling'." (interactive "P")) ;;;###autoload (defun hscroll-global-mode (&optional arg) "This function is obsolete. Emacs now does hscrolling automatically, if `truncate-lines' is non-nil. Also see `automatic-hscrolling'." (interactive "P")) (defun hscroll-window-maybe () "This function is obsolete. Emacs now does hscrolling automatically, if `truncate-lines' is non-nil. Also see `automatic-hscrolling'." (interactive)) (provide 'hscroll) ;;; arch-tag: 48377520-e5ca-401d-b360-3881b2d5a05a ;;; hscroll.el ends here