[Emacs-diffs] /srv/bzr/emacs/trunk r107511: * lisp/simple.el (backward-delete-char-untabify): Constrain point to

[Leo Liu]

------------------------------------------------------------
revno: 107511
fixes bug(s): http://debbugs.gnu.org/10939
committer: Leo Liu <address@hidden>
branch nick: trunk
timestamp: Mon 2012-03-05 23:53:34 +0800
message:
  * lisp/simple.el (backward-delete-char-untabify): Constrain point to
  field.
modified:
  lisp/ChangeLog
  lisp/simple.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-03-05 10:44:31 +0000
+++ b/lisp/ChangeLog    2012-03-05 15:53:34 +0000
@@ -1,5 +1,8 @@
 2012-03-05  Leo Liu  <address@hidden>
 
+       * simple.el (backward-delete-char-untabify): Constrain point to
+       field (Bug#10939).
+
        * eshell/em-cmpl.el (eshell-cmpl-initialize): Fix shift-tab key.
 
 2012-03-05  Chong Yidong  <address@hidden>

=== modified file 'lisp/simple.el'
--- a/lisp/simple.el    2012-03-05 06:10:11 +0000
+++ b/lisp/simple.el    2012-03-05 15:53:34 +0000
@@ -3463,8 +3463,10 @@
                      ((eq backward-delete-char-untabify-method 'all)
                       " \t\n\r")))
          (n (if skip
-                (let ((wh (- (point) (save-excursion (skip-chars-backward skip)
-                                                     (point)))))
+                (let* ((oldpt (point))
+                       (wh (- oldpt (save-excursion
+                                      (skip-chars-backward skip)
+                                      (constrain-to-field nil oldpt)))))
                   (+ arg (if (zerop wh) 0 (1- wh))))
               arg)))
     ;; Avoid warning about delete-backward-char