[Emacs-diffs] emacs-24 r117270: * lisp/emacs-lisp/smie.el (smie-config--guess): Fix typo.

[Stefan Monnier]

------------------------------------------------------------
revno: 117270
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=17818
committer: Stefan Monnier <address@hidden>
branch nick: emacs-24
timestamp: Fri 2014-06-20 17:10:40 -0400
message:
  * lisp/emacs-lisp/smie.el (smie-config--guess): Fix typo.
  (smie-config-guess): Use smie-config-local so the rules are obeyed.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/emacs-lisp/smie.el        smie.el-20100517192034-xap3ihmey43772vj-1

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-06-20 18:35:04 +0000
+++ b/lisp/ChangeLog    2014-06-20 21:10:40 +0000
@@ -1,5 +1,9 @@
 2014-06-20  Stefan Monnier  <address@hidden>
 
+       * 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  <address@hidden>
 
-       * 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).
 

=== modified file 'lisp/emacs-lisp/smie.el'
--- a/lisp/emacs-lisp/smie.el   2014-06-20 01:05:40 +0000
+++ b/lisp/emacs-lisp/smie.el   2014-06-20 21:10:40 +0000
@@ -2138,7 +2138,7 @@
                   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 @@
     (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)))))