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

[Lars Hansen]

Index: emacs/lisp/desktop.el
diff -c emacs/lisp/desktop.el:1.72 emacs/lisp/desktop.el:1.73
*** emacs/lisp/desktop.el:1.72  Fri May  7 19:40:29 2004
--- emacs/lisp/desktop.el       Mon May 31 21:44:59 2004
***************
*** 326,332 ****
  mode is active.  RESTORE-FUNCTION is the function to activate the minor mode.
  called.  RESTORE-FUNCTION nil means don't try to restore the minor mode.
  Only minor modes for which the name of the buffer-local variable
! and the name of the minor mode function are different have to added to
  this table."
    :type 'sexp
    :group 'desktop)
--- 326,332 ----
  mode is active.  RESTORE-FUNCTION is the function to activate the minor mode.
  called.  RESTORE-FUNCTION nil means don't try to restore the minor mode.
  Only minor modes for which the name of the buffer-local variable
! and the name of the minor mode function are different have to be added to
  this table."
    :type 'sexp
    :group 'desktop)
***************
*** 589,604 ****
                      major-mode
                      ;; minor modes
                      (let (ret)
!                       (mapcar
!                         #'(lambda (mim)
                            (and
!                             (boundp mim)
!                             (symbol-value mim)
!                             (setq ret
!                               (cons
!                                 (let ((special (assq mim 
desktop-minor-mode-table)))
!                                   (if special (cadr special) mim))
!                                 ret))))
                          (mapcar #'car minor-mode-alist))
                        ret)
                      (point)
--- 589,605 ----
                      major-mode
                      ;; minor modes
                      (let (ret)
!                       (mapc
!                         #'(lambda (minor-mode)
                            (and
!                             (boundp minor-mode)
!                             (symbol-value minor-mode)
!                             (let ((special (assq minor-mode 
desktop-minor-mode-table)))
!                               (when (or special (functionp minor-mode))
!                                 (setq ret
!                                   (cons
!                                     (if special (cadr special) minor-mode)
!                                     ret))))))
                          (mapcar #'car minor-mode-alist))
                        ret)
                      (point)