/[emacs]/emacs/lisp/desktop.el
ViewVC logotype

Diff of /emacs/lisp/desktop.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.88 by lektu, Thu Jul 21 11:49:32 2005 UTC revision 1.89 by lektu, Fri Jul 29 10:22:19 2005 UTC
# Line 106  desktop is saved." Line 106  desktop is saved."
106    :group 'desktop)    :group 'desktop)
107    
108  ;; Maintained for backward compatibility  ;; Maintained for backward compatibility
109  (define-obsolete-variable-alias 'desktop-enable 'desktop-save-mode "22.1")  (define-obsolete-variable-alias 'desktop-enable
110                                    'desktop-save-mode "22.1")
111    
112  (defcustom desktop-save 'ask-if-new  (defcustom desktop-save 'ask-if-new
113    "*Specifies whether the desktop should be saved when it is killed.    "*Specifies whether the desktop should be saved when it is killed.
# Line 136  determine where the desktop is saved." Line 137  determine where the desktop is saved."
137    "Name of file for Emacs desktop, excluding the directory part."    "Name of file for Emacs desktop, excluding the directory part."
138    :type 'file    :type 'file
139    :group 'desktop)    :group 'desktop)
140  (define-obsolete-variable-alias 'desktop-basefilename 'desktop-base-file-name "22.1")  (define-obsolete-variable-alias 'desktop-basefilename
141                                    'desktop-base-file-name "22.1")
142    
143  (defcustom desktop-path '("." "~")  (defcustom desktop-path '("." "~")
144    "List of directories to search for the desktop file.    "List of directories to search for the desktop file.
# Line 292  See `desktop-restore-eager'." Line 294  See `desktop-restore-eager'."
294    "When non-nil, save buffer status in desktop file.    "When non-nil, save buffer status in desktop file.
295  This variable becomes buffer local when set.  This variable becomes buffer local when set.
296    
297  If the value is a function, it called by `desktop-save' with argument  If the value is a function, it is called by `desktop-save' with argument
298  DESKTOP-DIRNAME to obtain auxiliary information to saved in the desktop  DESKTOP-DIRNAME to obtain auxiliary information to save in the desktop
299  file along with the state of the buffer for which it was called.  file along with the state of the buffer for which it was called.
300    
301  When file names are returned, they should be formatted using the call  When file names are returned, they should be formatted using the call
# Line 776  It returns t if a desktop file was loade Line 778  It returns t if a desktop file was loade
778  (defun desktop-load-default ()  (defun desktop-load-default ()
779    "Load the `default' start-up library manually.    "Load the `default' start-up library manually.
780  Also inhibit further loading of it."  Also inhibit further loading of it."
781    (if (not inhibit-default-init)        ; safety check    (unless inhibit-default-init          ; safety check
782        (progn      (load "default" t t)
783          (load "default" t t)      (setq inhibit-default-init t)))
784          (setq inhibit-default-init t))))  (make-obsolete 'desktop-load-default
785  (make-obsolete 'desktop-load-default 'desktop-save-mode "22.1")                 'desktop-save-mode "22.1")
786    
787  ;; ----------------------------------------------------------------------------  ;; ----------------------------------------------------------------------------
788  ;;;###autoload  ;;;###autoload
# Line 801  directory DIRNAME." Line 803  directory DIRNAME."
803    "Save the desktop in directory `desktop-dirname'."    "Save the desktop in directory `desktop-dirname'."
804    (interactive)    (interactive)
805    (if desktop-dirname    (if desktop-dirname
806      (desktop-save desktop-dirname)        (desktop-save desktop-dirname)
807      (call-interactively 'desktop-save))      (call-interactively 'desktop-save))
808    (message "Desktop saved in %s" desktop-dirname))    (message "Desktop saved in %s" desktop-dirname))
809    

Legend:
Removed from v.1.88  
changed lines
  Added in v.1.89

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26