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

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/02/19 16:55:27

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

Log message:
        (end-of-defun): Consider the ".*\n" after the end of
        the function as being part of the function.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15356&r2=1.15357
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/emacs-lisp/lisp.el?cvsroot=emacs&r1=1.98&r2=1.99

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15356
retrieving revision 1.15357
diff -u -b -r1.15356 -r1.15357
--- ChangeLog   19 Feb 2009 06:52:35 -0000      1.15356
+++ ChangeLog   19 Feb 2009 16:55:24 -0000      1.15357
@@ -1,3 +1,8 @@
+2009-02-19  Stefan Monnier  <address@hidden>
+
+       * emacs-lisp/lisp.el (end-of-defun): Consider the ".*\n" after the end 
of
+       the function as being part of the function.
+
 2009-02-19  Nick Roberts  <address@hidden>
 
        * progmodes/compile.el (compilation-error-regexp-alist-alist): 

Index: emacs-lisp/lisp.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/emacs-lisp/lisp.el,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -b -r1.98 -r1.99
--- emacs-lisp/lisp.el  14 Feb 2009 04:19:34 -0000      1.98
+++ emacs-lisp/lisp.el  19 Feb 2009 16:55:26 -0000      1.99
@@ -345,6 +345,14 @@
   (let ((pos (point))
         (beg (progn (end-of-line 1) (beginning-of-defun-raw 1) (point))))
     (funcall end-of-defun-function)
+    ;; When comparing point against pos, we want to consider that if
+    ;; point was right after the end of the function, it's still
+    ;; considered as "in that function".
+    ;; E.g. `eval-defun' from right after the last close-paren.
+    (unless (bolp)
+      (skip-chars-forward " \t")
+      (if (looking-at "\\s<\\|\n")
+          (forward-line 1)))
     (cond
      ((> arg 0)
       ;; Moving forward.