]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge branch 'widen-less' into emacs-26
authorDmitry Gutov <dgutov@yandex.ru>
Wed, 20 Dec 2017 22:34:07 +0000 (00:34 +0200)
committerDmitry Gutov <dgutov@yandex.ru>
Wed, 20 Dec 2017 22:34:07 +0000 (00:34 +0200)
1  2 
etc/NEWS
lisp/progmodes/python.el
lisp/progmodes/ruby-mode.el

diff --cc etc/NEWS
Simple merge
index 4388cbdc060f259751857c4e4e7722a79c339969,b8926529d1e679d0eda6bfb60f33046262cf10ce..a72a55d2d9a6406959f3d431c33d2a8f1dfbf5eb
@@@ -4822,14 -4807,12 +4810,12 @@@ With optional argument LINE-NUMBER, che
                    (not (equal (char-before (point)) ?\\)))
          (forward-line 1))
        (when (equal (char-before) ?\\)
-         (point-marker)))))
+         (point-marker))))
  
  (defun python-info-beginning-of-backslash (&optional line-number)
 -  "Return the point where the backslashed line start.
 +  "Return the point where the backslashed line starts.
  Optional argument LINE-NUMBER forces the line number to check against."
    (save-excursion
-     (save-restriction
-       (prog-widen)
        (when line-number
          (python-util-goto-line line-number))
        (when (python-info-line-ends-backslash-p)
Simple merge