Show
Ignore:
Timestamp:
11/02/05 00:34:59 (3 years ago)
Author:
miyoshi
Message:

Sync up with Emacs CVS HEAD.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lisp/desktop.el

    r3894 r3945  
    294294;; We skip .log files because they are normally temporary. 
    295295;;         (ftp) files because they require passwords and whatnot. 
    296 ;;         TAGS files to save time (tags-file-name is saved instead). 
    297296(defcustom desktop-buffers-not-to-save 
    298   "\\(^nn\\.a[0-9]+\\|\\.log\\|(ftp)\\|^tags\\|^TAGS\\)$" 
     297  "\\(^nn\\.a[0-9]+\\|\\.log\\|(ftp)\\)$" 
    299298  "Regexp identifying buffers that are to be excluded from saving." 
    300299  :type 'regexp 
    …… 
    308307  :group 'desktop) 
    309308 
    310 (defcustom desktop-modes-not-to-save nil 
     309;; We skip TAGS files to save time (tags-file-name is saved instead). 
     310(defcustom desktop-modes-not-to-save 
     311  '(tags-table-mode) 
    311312  "List of major modes whose buffers should not be saved." 
    312313  :type '(repeat symbol) 
    …… 
    964965(defun desktop-load-file (function) 
    965966  "Load the file where auto loaded FUNCTION is defined." 
    966   (let ((fcell (symbol-function function))) 
    967     (when (and (listp fcell) 
    968                (eq 'autoload (car fcell))) 
    969       (load (cadr fcell))))) 
     967  (when function 
     968    (let ((fcell (symbol-function function))) 
     969      (when (and (listp fcell) 
     970                 (eq 'autoload (car fcell))) 
     971        (load (cadr fcell)))))) 
    970972 
    971973;; ----------------------------------------------------------------------------