mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-06 14:30:50 -08:00
Code Issues Projects Releases Wiki Activity

Merge from emacs-24; up to 2014-06-03T06:51:18Z!eliz@gnu.org

Browse source
This commit is contained in:
Glenn Morris 2014-06-14 17:06:30 -07:00
commit 90de50e270
15 changed files with 203 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/emacs-lisp/smie.el
View file

@ -709,7 +709,8 @@ Possible return values:
(condition-case err
(progn (funcall next-sexp 1) nil)
(scan-error
(let ((epos (nth 2 err)))
(let* ((epos1 (nth 2 err))
(epos (if (<= (point) epos1) (nth 3 err) epos1)))
(goto-char pos)
(throw 'return
(list t epos
@ -1832,6 +1833,8 @@ KEYWORDS are additional arguments, which can use the following keywords:
(append smie-blink-matching-triggers
(delete-dups triggers)))))))
(declare-function edebug-instrument-function "edebug" (func))
(defun smie-edebug ()
"Instrument the `smie-rules-function' for Edebug."
(interactive)