[Emacs-diffs] trunk r113663: * lisp/emacs-lisp/easy-mmode.el (define-globalized-minor-mode)

[Stefan Monnier]

------------------------------------------------------------
revno: 113663
revision-id: address@hidden
parent: address@hidden
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Fri 2013-08-02 17:23:07 -0400
message:
  * lisp/emacs-lisp/easy-mmode.el (define-globalized-minor-mode)
  (easy-mmode-define-navigation): Avoid ((lambda (..) ..) ...).
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/emacs-lisp/easy-mmode.el  
easymmode.el-20091113204419-o5vbwnq5f7feedwu-1190

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-08-02 21:16:33 +0000
+++ b/lisp/ChangeLog    2013-08-02 21:23:07 +0000
@@ -1,5 +1,8 @@
 2013-08-02  Stefan Monnier  <address@hidden>
 
+       * emacs-lisp/easy-mmode.el (define-globalized-minor-mode)
+       (easy-mmode-define-navigation): Avoid ((lambda (..) ..) ...).
+
        * custom.el (custom-initialize-default, custom-initialize-set)
        (custom-initialize-reset, custom-initialize-changed): Affect the
        toplevel-default-value (bug#6275, bug#14586).

=== modified file 'lisp/emacs-lisp/easy-mmode.el'
--- a/lisp/emacs-lisp/easy-mmode.el     2013-05-27 16:12:52 +0000
+++ b/lisp/emacs-lisp/easy-mmode.el     2013-08-02 21:23:07 +0000
@@ -419,7 +419,7 @@
         ;; Go through existing buffers.
         (dolist (buf (buffer-list))
           (with-current-buffer buf
-            (if ,global-mode (,turn-on) (when ,mode (,mode -1))))))
+            (if ,global-mode (funcall #',turn-on) (when ,mode (,mode -1))))))
 
        ;; Autoloading define-globalized-minor-mode autoloads everything
        ;; up-to-here.
@@ -449,8 +449,8 @@
                   (if ,mode
                       (progn
                         (,mode -1)
-                        (,turn-on))
-                    (,turn-on))))
+                        (funcall #',turn-on))
+                    (funcall #',turn-on))))
               (setq ,MODE-major-mode major-mode)))))
        (put ',MODE-enable-in-buffers 'definition-name ',global-mode)
 
@@ -589,7 +589,7 @@
                       (prog1 (or (< (- (point-max) (point-min)) (buffer-size)))
                         (widen))))
                  ,body
-                 (when was-narrowed (,narrowfun)))))))
+                 (when was-narrowed (funcall #',narrowfun)))))))
     (unless name (setq name base-name))
     `(progn
        (defun ,next-sym (&optional count)
@@ -601,13 +601,13 @@
            ,(funcall when-narrowed
              `(if (not (re-search-forward ,re nil t count))
                   (if (looking-at ,re)
-                      (goto-char (or ,(if endfun `(,endfun)) (point-max)))
+                      (goto-char (or ,(if endfun `(funcall #',endfun)) 
(point-max)))
                     (user-error "No next %s" ,name))
                 (goto-char (match-beginning 0))
                 (when (and (eq (current-buffer) (window-buffer 
(selected-window)))
                            (called-interactively-p 'interactive))
                   (let ((endpt (or (save-excursion
-                                     ,(if endfun `(,endfun)
+                                     ,(if endfun `(funcall #',endfun)
                                         `(re-search-forward ,re nil t 2)))
                                    (point-max))))
                     (unless (pos-visible-in-window-p endpt nil t)