[Emacs-diffs] Changes to emacs/lisp/emacs-lisp/easy-mmode.el

[Stefan Monnier]

Index: emacs/lisp/emacs-lisp/easy-mmode.el
diff -c emacs/lisp/emacs-lisp/easy-mmode.el:1.70 
emacs/lisp/emacs-lisp/easy-mmode.el:1.71
*** emacs/lisp/emacs-lisp/easy-mmode.el:1.70    Fri Jul 22 01:26:03 2005
--- emacs/lisp/emacs-lisp/easy-mmode.el Wed Aug 24 11:54:25 2005
***************
*** 194,221 ****
  Use the command `%s' to change this variable." pretty-name mode))
               (make-variable-buffer-local ',mode))
  
!         (let ((curfile (or (and (boundp 'byte-compile-current-file)
!                                 byte-compile-current-file)
!                            load-file-name))
!               base-doc-string)
!           (setq base-doc-string "Non-nil if %s is enabled.
! See the command `%s' for a description of this minor-mode.
  Setting this variable directly does not take effect;
! use either \\[customize] or the function `%s'.")
!           (if (null body)
!               (setq base-doc-string "Non-nil if %s is enabled.
! See the command `%s' for a description of this minor-mode."))
! 
            `(defcustom ,mode ,init-value
               ,(format base-doc-string pretty-name mode mode)
               ,@set
               ,@initialize
               ,@group
               ,@type
!              ,@(cond
!                 ((not (and curfile require)) nil)
!                 ((not (eq require t)) `(:require ,require)))
!              ,@(nreverse extra-keywords))))
  
         ;; The actual function.
         (defun ,mode (&optional arg ,@extra-args)
--- 194,213 ----
  Use the command `%s' to change this variable." pretty-name mode))
               (make-variable-buffer-local ',mode))
  
!         (let ((base-doc-string
!                  (concat "Non-nil if %s is enabled.
! See the command `%s' for a description of this minor-mode."
!                          (if body "
  Setting this variable directly does not take effect;
! use either \\[customize] or the function `%s'."))))
            `(defcustom ,mode ,init-value
               ,(format base-doc-string pretty-name mode mode)
               ,@set
               ,@initialize
               ,@group
               ,@type
!              ,@(unless (eq require t) `(:require ,require))
!                ,@(nreverse extra-keywords))))
  
         ;; The actual function.
         (defun ,mode (&optional arg ,@extra-args)