[Emacs-diffs] /srv/bzr/emacs/trunk r107036: Tweak previous define-minor-mode change

[Glenn Morris]

------------------------------------------------------------
revno: 107036
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2012-01-31 21:17:17 -0500
message:
  Tweak previous define-minor-mode change
  
  * lisp/emacs-lisp/easy-mmode.el (define-minor-mode):
  Relax :variable's test for a named function.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/easy-mmode.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-01-31 21:59:58 +0000
+++ b/lisp/ChangeLog    2012-02-01 02:17:17 +0000
@@ -1,3 +1,8 @@
+2012-02-01  Glenn Morris  <address@hidden>
+
+       * emacs-lisp/easy-mmode.el (define-minor-mode):
+       Relax :variable's test for a named function.
+
 2012-01-31  Alan Mackenzie  <address@hidden>
 
        * progmodes/cc-engine.el (c-guess-basic-syntax): CASE 5B.1: Fix an

=== modified file 'lisp/emacs-lisp/easy-mmode.el'
--- a/lisp/emacs-lisp/easy-mmode.el     2012-01-31 04:52:29 +0000
+++ b/lisp/emacs-lisp/easy-mmode.el     2012-02-01 02:17:17 +0000
@@ -182,15 +182,9 @@
        (:require (setq require (pop body)))
        (:keymap (setq keymap (pop body)))
         (:variable (setq variable (pop body))
-         (setq tmp (cdr-safe variable))
-         (if (not (or (functionp tmp)
-                      (and tmp
-                           (symbolp tmp)
-                           ;; Hack to allow for named functions not within
-                           ;; eval-when-compile.
-                           ;; Cf define-compilation-mode.
-                           (boundp 'byte-compile-function-environment)
-                           (assq tmp byte-compile-function-environment))))
+         (if (not (and (setq tmp (cdr-safe variable))
+                       (or (symbolp tmp)
+                           (functionp tmp))))
              ;; PLACE is not of the form (GET . SET).
              (setq mode variable)
            (setq mode (car variable))