summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2010-07-06 20:52:05 -0700
committerGlenn Morris <rgm@gnu.org>2010-07-06 20:52:05 -0700
commit49554388208ef121ca91a20212645d47d8cd56ed (patch)
tree356c399b9f816d0f4513649d34d95e2b116f6ca6 /lisp
parente8579ebc1540c34d90c238d6e649387c840ceb04 (diff)
downloademacs-49554388208ef121ca91a20212645d47d8cd56ed.tar.gz
Minor zone.el fix.
* play/zone.el (zone-fall-through-ws): Fix next-line -> forward-line fallout.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/play/zone.el10
2 files changed, 11 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e4bd2cce4b8..1aa812bb534 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-07 Glenn Morris <rgm@gnu.org>
+
+ * play/zone.el (zone-fall-through-ws): Fix next-line ->
+ forward-line fallout.
+
2010-07-06 Chong Yidong <cyd@stupidchicken.com>
* mouse.el (mouse-appearance-menu): Add docstring.
diff --git a/lisp/play/zone.el b/lisp/play/zone.el
index 367c301de44..cf22be164d9 100644
--- a/lisp/play/zone.el
+++ b/lisp/play/zone.el
@@ -1,7 +1,7 @@
;;; zone.el --- idle display hacks
-;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+;; 2009, 2010 Free Software Foundation, Inc.
;; Author: Victor Zandy <zandy@cs.wisc.edu>
;; Maintainer: Thien-Thi Nguyen <ttn@gnu.org>
@@ -487,8 +487,10 @@ If the element is a function or a list of a function and a number,
(wait 0.15)
newpos fall-p)
(while (when (save-excursion
- (forward-line 1)
- (and (= col (current-column))
+ (and (zerop (forward-line 1))
+ (progn
+ (forward-char col)
+ (= col (current-column)))
(setq newpos (point))
(string= spaces (buffer-substring-no-properties
newpos (+ newpos cw-ceil)))