* lisp/emacs-lisp/smie.el (smie-config--guess): Fix typo.

(smie-config-guess): Use smie-config-local so the rules are obeyed.

Fixes: debbugs:17818

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fcbd0c39655dcde747580398499f99bd70ffe7d8..46e3b0f63210040927c5e66d59d434cfe44515c2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2014-06-20  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * emacs-lisp/smie.el (smie-config--guess): Fix typo.
+       (smie-config-guess): Use smie-config-local so the rules are obeyed
+       (bug#17818).
+
        * mouse.el (mouse-drag-line): Don't re-add to unread-comment-events,
        since it's already done inside the loop (bug#17819).
 
@@ -11,9 +15,6 @@
 
 2014-06-20  Stefan Monnier  <monnier@iro.umontreal.ca>
 
-       * mouse.el (mouse-drag-line): Remove left-over code made redundant by
-       mouse--down-1-maybe-follows-link (bug#17819).
-
        * progmodes/sh-script.el (sh-smie-sh-rules): For { after &&, don't
        align with the surrounding parent (bug#17721).
 

diff --git a/lisp/emacs-lisp/smie.el b/lisp/emacs-lisp/smie.el
index 1a6011e712a570f61d2f040f5cd4754995d27ac1..1819daa3df0118adf4beaa8b76d1dd5516a5cdfa 100644 (file)
--- a/lisp/emacs-lisp/smie.el
+++ b/lisp/emacs-lisp/smie.el
@@ -2138,7 +2138,7 @@ position corresponding to each rule."
                   nil
                 (push (cons (+ offset (nth 2 sig)) sig) rules)
                 ;; Adjust the rest of the data.
-                (pcase-dolist ((and cotrace `(,count ,toffset ,trace))
+                (pcase-dolist ((and cotrace `(,count ,toffset . ,trace))
                                cotraces)
                   (setf (nth 1 cotrace) (- toffset offset))
                   (dolist (sig trace)
@@ -2167,15 +2167,14 @@ To save the result for future sessions, use `smie-config-save'."
     (cond
      ((null config) (message "Nothing to change"))
      ((null smie-config--buffer-local)
-      (message "Local rules set")
-      (setq smie-config--buffer-local config))
+      (smie-config-local config)
+      (message "Local rules set"))
      ((y-or-n-p "Replace existing local config? ")
       (message "Local rules replaced")
-      (setq smie-config--buffer-local config))
+      (smie-config-local config))
      ((y-or-n-p "Merge with existing local config? ")
       (message "Local rules adjusted")
-      (setq smie-config--buffer-local
-            (append config smie-config--buffer-local)))
+      (smie-config-local (append config smie-config--buffer-local)))
      (t
       (message "Rules guessed: %S" config)))))