[Emacs-diffs] emacs/lisp ChangeLog emacs-lisp/lisp.el

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/02/12 04:16:18

Modified files:
        lisp           : ChangeLog 
        lisp/emacs-lisp: lisp.el 

Log message:
        (end-of-defun): Don't skip to next line after
        calling end-of-defun-function if it already moved to BOL.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15305&r2=1.15306
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/emacs-lisp/lisp.el?cvsroot=emacs&r1=1.95&r2=1.96

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15305
retrieving revision 1.15306
diff -u -b -r1.15305 -r1.15306
--- ChangeLog   12 Feb 2009 04:01:11 -0000      1.15305
+++ ChangeLog   12 Feb 2009 04:16:14 -0000      1.15306
@@ -1,3 +1,8 @@
+2009-02-12  Stefan Monnier  <address@hidden>
+
+       * emacs-lisp/lisp.el (end-of-defun): Don't skip to next line after
+       calling end-of-defun-function if it already moved to BOL.
+
 2009-02-12  Richard M Stallman  <address@hidden>
 
        * mail/rmail.el (rmail-show-message-verbose-min): New option.
@@ -106,8 +111,7 @@
 2009-02-09  Ulf Jasper  <address@hidden>
 
        * net/newst-treeview.el (newsticker-treeview-save)
-       (newsticker--treeview-load): Kill groups buffer after
-       saving/loading.
+       (newsticker--treeview-load): Kill groups buffer after saving/loading.
 
 2009-02-09  Tassilo Horn  <address@hidden>
 

Index: emacs-lisp/lisp.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/emacs-lisp/lisp.el,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -b -r1.95 -r1.96
--- emacs-lisp/lisp.el  4 Feb 2009 05:48:19 -0000       1.95
+++ emacs-lisp/lisp.el  12 Feb 2009 04:16:17 -0000      1.96
@@ -348,9 +348,10 @@
       (beginning-of-defun-raw 1)
       (while (unless (eobp)
                (funcall end-of-defun-function)
+               (unless (bolp)
                (skip-chars-forward " \t")
                (if (looking-at "\\s<\\|\n")
-                   (forward-line 1))
+                     (forward-line 1)))
                ;; If we started after the end of the previous
                ;; function, try again with the next one.
                (unless (or (> (point) pos)
@@ -370,9 +371,10 @@
                (let ((beg (point))
                     retry-point)
                  (funcall end-of-defun-function)
+                 (unless (bolp)
                  (skip-chars-forward " \t")
                  (if (looking-at "\\s<\\|\n")
-                     (forward-line 1))
+                       (forward-line 1)))
                  ;; If we started from within the function just found,
                  ;; try again with the previous one.
                  (unless (or (< (point) pos)