[Emacs-diffs] /srv/bzr/emacs/trunk r105892: * erc-button.el (erc-button-next-function): Scoping fix (Bug#9487).

[Chong Yidong]

------------------------------------------------------------
revno: 105892
author: Antoine Levitt <address@hidden>
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Fri 2011-09-23 17:22:31 -0400
message:
  * erc-button.el (erc-button-next-function): Scoping fix (Bug#9487).
modified:
  lisp/erc/ChangeLog
  lisp/erc/erc-button.el

=== modified file 'lisp/erc/ChangeLog'
--- a/lisp/erc/ChangeLog        2011-07-04 13:23:04 +0000
+++ b/lisp/erc/ChangeLog        2011-09-23 21:22:31 +0000
@@ -1,3 +1,8 @@
+2011-09-23  Antoine Levitt  <address@hidden>
+
+       * erc-button.el (erc-button-next-function): Scoping fix
+       (Bug#9487).
+
 2011-07-04  Vivek Dasmohapatra  <address@hidden>
 
        * erc.el (erc-generate-new-buffer-name): Reuse old buffer names

=== modified file 'lisp/erc/erc-button.el'
--- a/lisp/erc/erc-button.el    2011-04-26 13:50:09 +0000
+++ b/lisp/erc/erc-button.el    2011-09-23 21:22:31 +0000
@@ -430,19 +430,19 @@
 (defun erc-button-next-function ()
   "Pseudo completion function that actually jumps to the next button.
 For use on `completion-at-point-functions'."
-  (let ((here (point)))
-    (when (< here (erc-beg-of-input-line))
-      (lambda ()
-        (while (and (get-text-property here 'erc-callback)
-                    (not (= here (point-max))))
-          (setq here (1+ here)))
-        (while (and (not (get-text-property here 'erc-callback))
-                    (not (= here (point-max))))
-          (setq here (1+ here)))
-        (if (< here (point-max))
-            (goto-char here)
-          (error "No next button"))
-        t))))
+    (when (< (point) (erc-beg-of-input-line))
+      `(lambda ()
+         (let ((here ,(point)))
+           (while (and (get-text-property here 'erc-callback)
+                       (not (= here (point-max))))
+             (setq here (1+ here)))
+           (while (and (not (get-text-property here 'erc-callback))
+                       (not (= here (point-max))))
+             (setq here (1+ here)))
+           (if (< here (point-max))
+               (goto-char here)
+             (error "No next button"))
+           t))))
 
 (defun erc-button-next ()
   "Go to the next button in this buffer."