HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* keyboard.c (parse_tool_bar_item): For QClabel, set TOOL_BAR_ITEM_LABEL not HELP.
[bpt/emacs.git]
/
lisp
/
scroll-lock.el
diff --git
a/lisp/scroll-lock.el
b/lisp/scroll-lock.el
index
5896d64
..
b42b26e
100644
(file)
--- a/
lisp/scroll-lock.el
+++ b/
lisp/scroll-lock.el
@@
-1,6
+1,6
@@
;;; scroll-lock.el --- Scroll lock scrolling.
;;; scroll-lock.el --- Scroll lock scrolling.
-;; Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+;; Copyright (C) 2005, 2006, 2007
, 2008, 2009, 2010
Free Software Foundation, Inc.
;; Author: Ralf Angeli <angeli@iwi.uni-sb.de>
;; Maintainer: FSF
;; Author: Ralf Angeli <angeli@iwi.uni-sb.de>
;; Maintainer: FSF
@@
-8,10
+8,10
@@
;; This file is part of GNU Emacs.
;; This file is part of GNU Emacs.
-;; GNU Emacs is free software
;
you can redistribute it and/or modify
+;; 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
;; 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.
+;; the Free Software Foundation
, either version 3 of the License, 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
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-19,9
+19,7
@@
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with this program; see the file COPYING. If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
;;; Commentary:
@@
-88,7
+86,7
@@
during scrolling."
(or arg (setq arg 1))
(scroll-lock-update-goal-column)
(if (pos-visible-in-window-p (point-max))
(or arg (setq arg 1))
(scroll-lock-update-goal-column)
(if (pos-visible-in-window-p (point-max))
- (
next
-line arg)
+ (
forward
-line arg)
(scroll-up arg))
(scroll-lock-move-to-column scroll-lock-temporary-goal-column))
(scroll-up arg))
(scroll-lock-move-to-column scroll-lock-temporary-goal-column))
@@
-99,7
+97,7
@@
during scrolling."
(scroll-lock-update-goal-column)
(condition-case nil
(scroll-down arg)
(scroll-lock-update-goal-column)
(condition-case nil
(scroll-down arg)
- (beginning-of-buffer (
previous-line arg
)))
+ (beginning-of-buffer (
forward-line (- arg)
)))
(scroll-lock-move-to-column scroll-lock-temporary-goal-column))
(defun scroll-lock-forward-paragraph (&optional arg)
(scroll-lock-move-to-column scroll-lock-temporary-goal-column))
(defun scroll-lock-forward-paragraph (&optional arg)