lisp/frameset.el: Convert `frameset' to vector and add new slots.
(frameset): Use type vector, not list (incompatible change).
Do not declare a new constructor, use the default one.
Upgrade suggested properties `app', `name' and `desc' to slots `app',
`name' and `description', respectively, and add read-only slot `timestamp'.
Doc fixes.
(frameset-copy, frameset-persistent-filter-alist)
(frameset-filter-alist, frameset-switch-to-gui-p)
(frameset-switch-to-tty-p, frameset-filter-tty-to-GUI)
(frameset-filter-sanitize-color, frameset-filter-minibuffer)
(frameset-filter-iconified, frameset-keep-original-display-p):
Doc fixes.
(frameset-filter-shelve-param, frameset-filter-unshelve-param):
Rename from frameset-filter-(save|restore)-param. All callers changed.
Doc fix.
(frameset-p): Adapt to change to vector and be more thorough.
Change arg name to OBJECT. Doc fix.
(frameset-prop): Rename arg PROP to PROPERTY. Doc fix.
(frameset-session-filter-alist): Rename from frameset-live-filter-alist.
All callers changed.
(frameset-frame-with-id): Rename from frameset-locate-frame-id.
All callers changed.
(frameset--record-minibuffer-relationships): Rename from
frameset--process-minibuffer-frames. All callers changed.
(frameset-save): Add new keyword arguments APP, NAME and DESCRIPTION.
Use new default constructor (again). Doc fix.
(frameset--find-frame-if): Rename from `frameset--find-frame.
All callers changed.
(frameset--reuse-frame): Rename arg FRAME-CFG to PARAMETERS.
(frameset--initial-params): Rename arg FRAME-CFG to PARAMETERS.
Doc fix.
(frameset--restore-frame): Rename args FRAME-CFG and WINDOW-CFG to
PARAMETERS and WINDOW-STATE, respectively.
(frameset-restore): Add new keyword argument PREDICATE.
Reset frameset--target-display to nil. Doc fix.
lisp/desktop.el (desktop-save-frameset): Use new frameset-save args.
Use lexical-binding.
2013-08-07 22:54:08 +00:00
|
|
|
;;; desktop.el --- save partial status of Emacs when killed -*- lexical-binding: t -*-
|
1993-06-01 20:09:25 +00:00
|
|
|
|
2021-01-01 09:13:56 +00:00
|
|
|
;; Copyright (C) 1993-1995, 1997, 2000-2021 Free Software Foundation,
|
2015-01-01 22:26:41 +00:00
|
|
|
;; Inc.
|
1993-06-01 20:09:25 +00:00
|
|
|
|
|
|
|
;; Author: Morten Welinder <terra@diku.dk>
|
2000-02-02 14:05:36 +00:00
|
|
|
;; Keywords: convenience
|
2011-11-17 17:40:48 +00:00
|
|
|
;; Favorite-brand-of-beer: None, I hate beer.
|
1993-06-01 20:09:25 +00:00
|
|
|
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
2008-05-06 08:06:51 +00:00
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
1993-06-01 20:09:25 +00:00
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2008-05-06 08:06:51 +00:00
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
;; (at your option) any later version.
|
1993-06-01 20:09:25 +00:00
|
|
|
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
2017-09-13 22:52:52 +00:00
|
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
1993-06-01 20:09:25 +00:00
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
1993-10-07 16:50:26 +00:00
|
|
|
;; Save the Desktop, i.e.,
|
|
|
|
;; - some global variables
|
|
|
|
;; - the list of buffers with associated files. For each buffer also
|
|
|
|
;; - the major mode
|
|
|
|
;; - the default directory
|
|
|
|
;; - the point
|
|
|
|
;; - the mark & mark-active
|
|
|
|
;; - buffer-read-only
|
1994-01-06 11:34:51 +00:00
|
|
|
;; - some local variables
|
2013-07-15 00:07:51 +00:00
|
|
|
;; - frame and window configuration
|
1993-06-01 20:09:25 +00:00
|
|
|
|
2004-04-16 12:51:06 +00:00
|
|
|
;; To use this, use customize to turn on desktop-save-mode or add the
|
2012-09-17 05:41:04 +00:00
|
|
|
;; following line somewhere in your init file:
|
1993-10-07 16:50:26 +00:00
|
|
|
;;
|
2004-04-16 12:51:06 +00:00
|
|
|
;; (desktop-save-mode 1)
|
1993-10-07 16:50:26 +00:00
|
|
|
;;
|
2004-04-16 12:51:06 +00:00
|
|
|
;; For further usage information, look at the section
|
2009-03-22 20:09:34 +00:00
|
|
|
;; (info "(emacs)Saving Emacs Sessions") in the GNU Emacs Manual.
|
2004-04-16 12:51:06 +00:00
|
|
|
|
|
|
|
;; When the desktop module is loaded, the function `desktop-kill' is
|
2007-04-11 02:28:26 +00:00
|
|
|
;; added to the `kill-emacs-hook'. This function is responsible for
|
2004-04-16 12:51:06 +00:00
|
|
|
;; saving the desktop when Emacs is killed. Furthermore an anonymous
|
2007-04-11 02:28:26 +00:00
|
|
|
;; function is added to the `after-init-hook'. This function is
|
2004-04-16 12:51:06 +00:00
|
|
|
;; responsible for loading the desktop when Emacs is started.
|
1994-01-06 11:34:51 +00:00
|
|
|
|
2005-08-10 19:38:52 +00:00
|
|
|
;; Special handling.
|
|
|
|
;; -----------------
|
|
|
|
;; Variables `desktop-buffer-mode-handlers' and `desktop-minor-mode-handlers'
|
|
|
|
;; are supplied to handle special major and minor modes respectively.
|
|
|
|
;; `desktop-buffer-mode-handlers' is an alist of major mode specific functions
|
2007-04-11 02:28:26 +00:00
|
|
|
;; to restore a desktop buffer. Elements must have the form
|
2006-02-10 11:07:50 +00:00
|
|
|
;;
|
2005-08-10 19:38:52 +00:00
|
|
|
;; (MAJOR-MODE . RESTORE-BUFFER-FUNCTION).
|
2006-02-10 11:07:50 +00:00
|
|
|
;;
|
2005-08-10 19:38:52 +00:00
|
|
|
;; Functions listed are called by `desktop-create-buffer' when `desktop-read'
|
2007-04-11 02:28:26 +00:00
|
|
|
;; evaluates the desktop file. Buffers with a major mode not specified here,
|
2005-08-10 19:38:52 +00:00
|
|
|
;; are restored by the default handler `desktop-restore-file-buffer'.
|
|
|
|
;; `desktop-minor-mode-handlers' is an alist of functions to restore
|
|
|
|
;; non-standard minor modes. Elements must have the form
|
2006-02-10 11:07:50 +00:00
|
|
|
;;
|
2005-08-10 19:38:52 +00:00
|
|
|
;; (MINOR-MODE . RESTORE-FUNCTION).
|
2006-02-10 11:07:50 +00:00
|
|
|
;;
|
2005-08-10 19:38:52 +00:00
|
|
|
;; Functions are called by `desktop-create-buffer' to restore minor modes.
|
|
|
|
;; Minor modes not specified here, are restored by the standard minor mode
|
|
|
|
;; function. If you write a module that defines a major or minor mode that
|
|
|
|
;; needs a special handler, then place code like
|
|
|
|
|
|
|
|
;; (defun foo-restore-desktop-buffer
|
|
|
|
;; ...
|
|
|
|
;; (add-to-list 'desktop-buffer-mode-handlers
|
|
|
|
;; '(foo-mode . foo-restore-desktop-buffer))
|
|
|
|
|
|
|
|
;; or
|
|
|
|
|
|
|
|
;; (defun bar-desktop-restore
|
|
|
|
;; ...
|
|
|
|
;; (add-to-list 'desktop-minor-mode-handlers
|
|
|
|
;; '(bar-mode . bar-desktop-restore))
|
|
|
|
|
2015-05-26 06:27:55 +00:00
|
|
|
;; in the module itself. The mode function must either be autoloaded,
|
|
|
|
;; or of the form "foobar-mode" and defined in library "foobar", so that
|
|
|
|
;; desktop can guess how to load its definition.
|
|
|
|
;; See the docstrings of `desktop-buffer-mode-handlers' and
|
2005-08-10 19:38:52 +00:00
|
|
|
;; `desktop-minor-mode-handlers' for more info.
|
|
|
|
|
|
|
|
;; Minor modes.
|
|
|
|
;; ------------
|
|
|
|
;; Conventional minor modes (see node "Minor Mode Conventions" in the elisp
|
|
|
|
;; manual) are handled in the following way:
|
|
|
|
;; When `desktop-save' saves the state of a buffer to the desktop file, it
|
|
|
|
;; saves as `desktop-minor-modes' the list of names of those variables in
|
|
|
|
;; `minor-mode-alist' that have a non-nil value.
|
|
|
|
;; When `desktop-create' restores the buffer, each of the symbols in
|
|
|
|
;; `desktop-minor-modes' is called as function with parameter 1.
|
|
|
|
;; The variables `desktop-minor-mode-table' and `desktop-minor-mode-handlers'
|
|
|
|
;; are used to handle non-conventional minor modes. `desktop-save' uses
|
|
|
|
;; `desktop-minor-mode-table' to map minor mode variables to minor mode
|
2007-04-11 02:28:26 +00:00
|
|
|
;; functions before writing `desktop-minor-modes'. If a minor mode has a
|
2005-08-10 19:38:52 +00:00
|
|
|
;; variable name that is different form its function name, an entry
|
|
|
|
|
|
|
|
;; (NAME RESTORE-FUNCTION)
|
|
|
|
|
|
|
|
;; should be added to `desktop-minor-mode-table'. If a minor mode should not
|
|
|
|
;; be restored, RESTORE-FUNCTION should be set to nil. `desktop-create' uses
|
|
|
|
;; `desktop-minor-mode-handlers' to lookup minor modes that needs a restore
|
|
|
|
;; function different from the usual minor mode function.
|
|
|
|
;; ---------------------------------------------------------------------------
|
2000-04-26 17:33:02 +00:00
|
|
|
|
1994-01-06 11:34:51 +00:00
|
|
|
;; By the way: don't use desktop.el to customize Emacs -- the file .emacs
|
|
|
|
;; in your home directory is used for that. Saving global default values
|
|
|
|
;; for buffers is an example of misuse.
|
|
|
|
|
1993-10-07 16:50:26 +00:00
|
|
|
;; PLEASE NOTE: The kill ring can be saved as specified by the variable
|
|
|
|
;; `desktop-globals-to-save' (by default it isn't). This may result in saving
|
|
|
|
;; things you did not mean to keep. Use M-x desktop-clear RET.
|
1994-01-06 11:34:51 +00:00
|
|
|
|
1994-05-01 02:07:27 +00:00
|
|
|
;; Thanks to hetrick@phys.uva.nl (Jim Hetrick) for useful ideas.
|
|
|
|
;; avk@rtsg.mot.com (Andrew V. Klein) for a dired tip.
|
|
|
|
;; chris@tecc.co.uk (Chris Boucher) for a mark tip.
|
|
|
|
;; f89-kam@nada.kth.se (Klas Mellbourn) for a mh-e tip.
|
2019-05-26 07:58:28 +00:00
|
|
|
;; kifer@cs.stonybrook.edu (M. Kifer) for a bug hunt.
|
1995-04-06 20:05:39 +00:00
|
|
|
;; treese@lcs.mit.edu (Win Treese) for ange-ftp tips.
|
2013-10-13 00:31:19 +00:00
|
|
|
;; pot@cnuce.cnr.it (Francesco Potortì) for misc. tips.
|
1993-10-07 16:50:26 +00:00
|
|
|
;; ---------------------------------------------------------------------------
|
|
|
|
;; TODO:
|
|
|
|
;;
|
|
|
|
;; Recognize more minor modes.
|
|
|
|
;; Save mark rings.
|
1993-06-01 20:09:25 +00:00
|
|
|
|
|
|
|
;;; Code:
|
|
|
|
|
2013-07-22 01:25:47 +00:00
|
|
|
(require 'cl-lib)
|
lisp/desktop.el: Move code related to saving frames to frameset.el.
Require frameset.
(desktop-restore-frames): Doc fix.
(desktop-restore-reuses-frames): Rename from
desktop-restoring-reuses-frames.
(desktop-saved-frameset): Rename from desktop-saved-frame-states.
(desktop-clear): Clear frames too.
(desktop-filter-parameters-alist): Set from frameset-filter-alist.
(desktop--filter-tty*, desktop-save, desktop-read):
Use frameset functions.
(desktop-before-saving-frames-functions, desktop--filter-*-color)
(desktop--filter-minibuffer, desktop--filter-restore-desktop-parm)
(desktop--filter-save-desktop-parm, desktop--filter-iconified-position)
(desktop-restore-in-original-display-p, desktop--filter-frame-parms)
(desktop--process-minibuffer-frames, desktop-save-frames)
(desktop--reuse-list, desktop--compute-pos, desktop--move-onscreen)
(desktop--find-frame, desktop--select-frame, desktop--make-frame)
(desktop--sort-states, desktop-restoring-frames-p)
(desktop-restore-frames): Remove. Most code moved to frameset.el.
(desktop-restoring-frameset-p, desktop-restore-frameset)
(desktop--check-dont-save, desktop-save-frameset): New functions.
(desktop--app-id): New constant.
(desktop-first-buffer, desktop-buffer-ok-count)
(desktop-buffer-fail-count): Move before first use.
lisp/frameset.el: New file.
2013-08-02 04:33:58 +00:00
|
|
|
(require 'frameset)
|
2013-07-22 01:25:47 +00:00
|
|
|
|
2015-02-09 13:25:53 +00:00
|
|
|
(defvar desktop-file-version "208"
|
2004-04-16 12:51:06 +00:00
|
|
|
"Version number of desktop file format.
|
2016-01-18 13:32:22 +00:00
|
|
|
Used at desktop read to provide backward compatibility.")
|
|
|
|
|
|
|
|
(defconst desktop-native-file-version 208
|
|
|
|
"Format version of the current desktop package, an integer.")
|
|
|
|
(defvar desktop-io-file-version nil
|
|
|
|
"The format version of the current desktop file (an integer) or nil.")
|
|
|
|
;; Note: Historically, the version number is embedded in the entry for
|
|
|
|
;; each buffer. It is highly inadvisable for different buffer entries
|
|
|
|
;; to have different format versions.
|
2003-04-09 01:37:56 +00:00
|
|
|
|
1994-01-06 11:34:51 +00:00
|
|
|
;; ----------------------------------------------------------------------------
|
1993-10-07 16:50:26 +00:00
|
|
|
;; USER OPTIONS -- settings you might want to play with.
|
|
|
|
;; ----------------------------------------------------------------------------
|
1997-04-12 03:18:33 +00:00
|
|
|
|
|
|
|
(defgroup desktop nil
|
|
|
|
"Save status of Emacs when you exit."
|
|
|
|
:group 'frames)
|
|
|
|
|
2004-04-16 12:51:06 +00:00
|
|
|
;;;###autoload
|
|
|
|
(define-minor-mode desktop-save-mode
|
Fix minor mode docstrings for the new meaning of a nil ARG.
* abbrev.el (abbrev-mode):
* allout.el (allout-mode):
* autoinsert.el (auto-insert-mode):
* autoarg.el (autoarg-mode, autoarg-kp-mode):
* autorevert.el (auto-revert-mode, auto-revert-tail-mode)
(global-auto-revert-mode):
* battery.el (display-battery-mode):
* composite.el (global-auto-composition-mode)
(auto-composition-mode):
* delsel.el (delete-selection-mode):
* desktop.el (desktop-save-mode):
* dired-x.el (dired-omit-mode):
* dirtrack.el (dirtrack-mode):
* doc-view.el (doc-view-minor-mode):
* double.el (double-mode):
* electric.el (electric-indent-mode, electric-pair-mode):
* emacs-lock.el (emacs-lock-mode):
* epa-hook.el (auto-encryption-mode):
* follow.el (follow-mode):
* font-core.el (font-lock-mode):
* frame.el (auto-raise-mode, auto-lower-mode, blink-cursor-mode):
* help.el (temp-buffer-resize-mode):
* hilit-chg.el (highlight-changes-mode)
(highlight-changes-visible-mode):
* hi-lock.el (hi-lock-mode):
* hl-line.el (hl-line-mode, global-hl-line-mode):
* icomplete.el (icomplete-mode):
* ido.el (ido-everywhere):
* image-file.el (auto-image-file-mode):
* image-mode.el (image-minor-mode):
* iswitchb.el (iswitchb-mode):
* jka-cmpr-hook.el (auto-compression-mode):
* linum.el (linum-mode):
* longlines.el (longlines-mode):
* master.el (master-mode):
* mb-depth.el (minibuffer-depth-indicate-mode):
* menu-bar.el (menu-bar-mode):
* minibuf-eldef.el (minibuffer-electric-default-mode):
* mouse-sel.el (mouse-sel-mode):
* msb.el (msb-mode):
* mwheel.el (mouse-wheel-mode):
* outline.el (outline-minor-mode):
* paren.el (show-paren-mode):
* recentf.el (recentf-mode):
* reveal.el (reveal-mode, global-reveal-mode):
* rfn-eshadow.el (file-name-shadow-mode):
* ruler-mode.el (ruler-mode):
* savehist.el (savehist-mode):
* scroll-all.el (scroll-all-mode):
* scroll-bar.el (scroll-bar-mode):
* server.el (server-mode):
* shell.el (shell-dirtrack-mode):
* simple.el (auto-fill-mode, transient-mark-mode)
(visual-line-mode, overwrite-mode, binary-overwrite-mode)
(line-number-mode, column-number-mode, size-indication-mode)
(auto-save-mode, normal-erase-is-backspace-mode, visible-mode):
* strokes.el (strokes-mode):
* time.el (display-time-mode):
* t-mouse.el (gpm-mouse-mode):
* tool-bar.el (tool-bar-mode):
* tooltip.el (tooltip-mode):
* type-break.el (type-break-mode-line-message-mode)
(type-break-query-mode):
* view.el (view-mode):
* whitespace.el (whitespace-mode, whitespace-newline-mode)
(global-whitespace-mode, global-whitespace-newline-mode):
* xt-mouse.el (xterm-mouse-mode): Doc fix.
* emacs-lisp/easy-mmode.el (define-globalized-minor-mode): Fix
autogenerated docstring.
2011-10-19 12:54:24 +00:00
|
|
|
"Toggle desktop saving (Desktop Save mode).
|
|
|
|
|
2014-02-18 01:33:30 +00:00
|
|
|
When Desktop Save mode is enabled, the state of Emacs is saved from
|
|
|
|
one session to another. In particular, Emacs will save the desktop when
|
|
|
|
it exits (this may prompt you; see the option `desktop-save'). The next
|
|
|
|
time Emacs starts, if this mode is active it will restore the desktop.
|
|
|
|
|
2015-08-21 21:08:47 +00:00
|
|
|
To manually save the desktop at any time, use the command `\\[desktop-save]'.
|
|
|
|
To load it, use `\\[desktop-read]'.
|
2014-02-18 01:33:30 +00:00
|
|
|
|
|
|
|
Once a desktop file exists, Emacs will auto-save it according to the
|
|
|
|
option `desktop-auto-save-timeout'.
|
|
|
|
|
|
|
|
To see all the options you can set, browse the `desktop' customization group.
|
|
|
|
|
|
|
|
For further details, see info node `(emacs)Saving Emacs Sessions'."
|
2004-04-16 12:51:06 +00:00
|
|
|
:global t
|
2014-02-07 07:44:29 +00:00
|
|
|
:group 'desktop
|
|
|
|
(if desktop-save-mode
|
2014-06-24 23:23:41 +00:00
|
|
|
(desktop-auto-save-enable)
|
|
|
|
(desktop-auto-save-disable)))
|
2004-04-16 12:51:06 +00:00
|
|
|
|
2007-06-12 09:11:31 +00:00
|
|
|
(defun desktop-save-mode-off ()
|
|
|
|
"Disable `desktop-save-mode'. Provided for use in hooks."
|
|
|
|
(desktop-save-mode 0))
|
|
|
|
|
2003-04-09 01:37:56 +00:00
|
|
|
(defcustom desktop-save 'ask-if-new
|
2008-12-03 05:48:14 +00:00
|
|
|
"Specifies whether the desktop should be saved when it is killed.
|
2004-04-16 12:51:06 +00:00
|
|
|
A desktop is killed when the user changes desktop or quits Emacs.
|
|
|
|
Possible values are:
|
2003-04-09 01:37:56 +00:00
|
|
|
t -- always save.
|
|
|
|
ask -- always ask.
|
|
|
|
ask-if-new -- ask if no desktop file exists, otherwise just save.
|
|
|
|
ask-if-exists -- ask if desktop file exists, otherwise don't save.
|
|
|
|
if-exists -- save if desktop file exists, otherwise don't save.
|
|
|
|
nil -- never save.
|
2004-04-16 12:51:06 +00:00
|
|
|
The desktop is never saved when `desktop-save-mode' is nil.
|
2005-07-19 09:54:05 +00:00
|
|
|
The variables `desktop-dirname' and `desktop-base-file-name'
|
2004-04-16 12:51:06 +00:00
|
|
|
determine where the desktop is saved."
|
2006-06-23 21:42:33 +00:00
|
|
|
:type
|
|
|
|
'(choice
|
2003-04-09 01:37:56 +00:00
|
|
|
(const :tag "Always save" t)
|
|
|
|
(const :tag "Always ask" ask)
|
|
|
|
(const :tag "Ask if desktop file is new, else do save" ask-if-new)
|
|
|
|
(const :tag "Ask if desktop file exists, else don't save" ask-if-exists)
|
|
|
|
(const :tag "Save if desktop file exists, else don't" if-exists)
|
|
|
|
(const :tag "Never save" nil))
|
2004-11-11 19:02:56 +00:00
|
|
|
:group 'desktop
|
2005-02-09 15:50:47 +00:00
|
|
|
:version "22.1")
|
2003-04-09 01:37:56 +00:00
|
|
|
|
2013-12-16 21:48:51 +00:00
|
|
|
(defcustom desktop-auto-save-timeout auto-save-timeout
|
2017-10-28 12:11:08 +00:00
|
|
|
"Number of seconds of idle time before auto-saving the desktop.
|
|
|
|
The desktop will be auto-saved when this amount of idle time have
|
|
|
|
passed after some change in the window configuration.
|
2014-02-18 01:33:30 +00:00
|
|
|
This applies to an existing desktop file when `desktop-save-mode' is enabled.
|
2013-12-16 21:48:51 +00:00
|
|
|
Zero or nil means disable auto-saving due to idleness."
|
2013-04-27 20:55:00 +00:00
|
|
|
:type '(choice (const :tag "Off" nil)
|
|
|
|
(integer :tag "Seconds"))
|
|
|
|
:set (lambda (symbol value)
|
|
|
|
(set-default symbol value)
|
2014-06-06 23:38:40 +00:00
|
|
|
(ignore-errors
|
|
|
|
(if (and (integerp value) (> value 0))
|
2014-06-24 23:23:41 +00:00
|
|
|
(desktop-auto-save-enable value)
|
|
|
|
(desktop-auto-save-disable))))
|
2013-04-27 20:55:00 +00:00
|
|
|
:group 'desktop
|
|
|
|
:version "24.4")
|
|
|
|
|
2007-06-12 11:14:52 +00:00
|
|
|
(defcustom desktop-load-locked-desktop 'ask
|
|
|
|
"Specifies whether the desktop should be loaded if locked.
|
|
|
|
Possible values are:
|
|
|
|
t -- load anyway.
|
|
|
|
nil -- don't load.
|
|
|
|
ask -- ask the user.
|
|
|
|
If the value is nil, or `ask' and the user chooses not to load the desktop,
|
|
|
|
the normal hook `desktop-not-loaded-hook' is run."
|
|
|
|
:type
|
|
|
|
'(choice
|
|
|
|
(const :tag "Load anyway" t)
|
|
|
|
(const :tag "Don't load" nil)
|
|
|
|
(const :tag "Ask the user" ask))
|
|
|
|
:group 'desktop
|
2007-10-27 17:14:37 +00:00
|
|
|
:version "22.2")
|
2007-06-12 11:14:52 +00:00
|
|
|
|
2003-04-09 01:37:56 +00:00
|
|
|
(defcustom desktop-base-file-name
|
1996-09-01 19:04:28 +00:00
|
|
|
(convert-standard-filename ".emacs.desktop")
|
2004-04-16 12:51:06 +00:00
|
|
|
"Name of file for Emacs desktop, excluding the directory part."
|
1997-12-29 20:58:19 +00:00
|
|
|
:type 'file
|
|
|
|
:group 'desktop)
|
1993-06-01 20:09:25 +00:00
|
|
|
|
2007-06-12 09:11:31 +00:00
|
|
|
(defcustom desktop-base-lock-name
|
|
|
|
(convert-standard-filename ".emacs.desktop.lock")
|
|
|
|
"Name of lock file for Emacs desktop, excluding the directory part."
|
|
|
|
:type 'file
|
|
|
|
:group 'desktop
|
2007-10-27 17:14:37 +00:00
|
|
|
:version "22.2")
|
2007-06-12 09:11:31 +00:00
|
|
|
|
2012-06-21 07:15:42 +00:00
|
|
|
(defcustom desktop-path (list user-emacs-directory "~")
|
2003-04-09 01:37:56 +00:00
|
|
|
"List of directories to search for the desktop file.
|
|
|
|
The base name of the file is specified in `desktop-base-file-name'."
|
|
|
|
:type '(repeat directory)
|
2004-11-11 19:02:56 +00:00
|
|
|
:group 'desktop
|
2010-09-02 05:38:30 +00:00
|
|
|
:version "23.2") ; user-emacs-directory added
|
2003-04-09 01:37:56 +00:00
|
|
|
|
1997-04-12 03:18:33 +00:00
|
|
|
(defcustom desktop-missing-file-warning nil
|
2006-05-14 20:26:37 +00:00
|
|
|
"If non-nil, offer to recreate the buffer of a deleted file.
|
2004-04-26 18:58:19 +00:00
|
|
|
Also pause for a moment to display message about errors signaled in
|
|
|
|
`desktop-buffer-mode-handlers'.
|
|
|
|
|
|
|
|
If nil, just print error messages in the message buffer."
|
1997-04-12 03:18:33 +00:00
|
|
|
:type 'boolean
|
2004-11-11 19:02:56 +00:00
|
|
|
:group 'desktop
|
2005-02-09 15:50:47 +00:00
|
|
|
:version "22.1")
|
1993-06-01 20:09:25 +00:00
|
|
|
|
2003-04-09 01:37:56 +00:00
|
|
|
(defcustom desktop-no-desktop-file-hook nil
|
2004-04-16 12:51:06 +00:00
|
|
|
"Normal hook run when `desktop-read' can't find a desktop file.
|
2006-06-23 21:42:33 +00:00
|
|
|
Run in the directory in which the desktop file was sought.
|
2005-04-03 14:01:43 +00:00
|
|
|
May be used to show a dired buffer."
|
2003-04-09 01:37:56 +00:00
|
|
|
:type 'hook
|
2004-11-11 19:02:56 +00:00
|
|
|
:group 'desktop
|
2005-02-09 15:50:47 +00:00
|
|
|
:version "22.1")
|
2003-04-09 01:37:56 +00:00
|
|
|
|
2007-06-12 09:11:31 +00:00
|
|
|
(defcustom desktop-not-loaded-hook nil
|
|
|
|
"Normal hook run when the user declines to re-use a desktop file.
|
|
|
|
Run in the directory in which the desktop file was found.
|
|
|
|
May be used to deal with accidental multiple Emacs jobs."
|
|
|
|
:type 'hook
|
|
|
|
:group 'desktop
|
|
|
|
:options '(desktop-save-mode-off save-buffers-kill-emacs)
|
2007-10-27 17:14:37 +00:00
|
|
|
:version "22.2")
|
2007-06-12 09:11:31 +00:00
|
|
|
|
2003-04-09 01:37:56 +00:00
|
|
|
(defcustom desktop-after-read-hook nil
|
2004-04-16 12:51:06 +00:00
|
|
|
"Normal hook run after a successful `desktop-read'.
|
2005-04-03 14:01:43 +00:00
|
|
|
May be used to show a buffer list."
|
2003-04-09 01:37:56 +00:00
|
|
|
:type 'hook
|
2004-11-11 19:02:56 +00:00
|
|
|
:group 'desktop
|
2006-06-23 21:42:33 +00:00
|
|
|
:options '(list-buffers)
|
2005-02-09 15:50:47 +00:00
|
|
|
:version "22.1")
|
2003-04-09 01:37:56 +00:00
|
|
|
|
|
|
|
(defcustom desktop-save-hook nil
|
2004-04-16 12:51:06 +00:00
|
|
|
"Normal hook run before the desktop is saved in a desktop file.
|
2006-06-23 21:42:33 +00:00
|
|
|
Run with the desktop buffer current with only the header present.
|
|
|
|
May be used to add to the desktop code or to truncate history lists,
|
|
|
|
for example."
|
2003-04-09 01:37:56 +00:00
|
|
|
:type 'hook
|
|
|
|
:group 'desktop)
|
|
|
|
|
2004-09-09 19:45:03 +00:00
|
|
|
(defcustom desktop-globals-to-save
|
|
|
|
'(desktop-missing-file-warning
|
|
|
|
tags-file-name
|
|
|
|
tags-table-list
|
|
|
|
search-ring
|
|
|
|
regexp-search-ring
|
2009-07-05 05:14:27 +00:00
|
|
|
register-alist
|
|
|
|
file-name-history)
|
2004-04-16 12:51:06 +00:00
|
|
|
"List of global variables saved by `desktop-save'.
|
|
|
|
An element may be variable name (a symbol) or a cons cell of the form
|
|
|
|
\(VAR . MAX-SIZE), which means to truncate VAR's value to at most
|
|
|
|
MAX-SIZE elements (if the value is a list) before saving the value.
|
2003-04-09 01:37:56 +00:00
|
|
|
Feature: Saving `kill-ring' implies saving `kill-ring-yank-pointer'."
|
|
|
|
:type '(repeat (restricted-sexp :match-alternatives (symbolp consp)))
|
|
|
|
:group 'desktop)
|
|
|
|
|
2004-09-09 19:45:03 +00:00
|
|
|
(defcustom desktop-globals-to-clear
|
|
|
|
'(kill-ring
|
|
|
|
kill-ring-yank-pointer
|
|
|
|
search-ring
|
|
|
|
search-ring-yank-pointer
|
|
|
|
regexp-search-ring
|
|
|
|
regexp-search-ring-yank-pointer)
|
2005-01-07 20:18:59 +00:00
|
|
|
"List of global variables that `desktop-clear' will clear.
|
2003-04-09 01:37:56 +00:00
|
|
|
An element may be variable name (a symbol) or a cons cell of the form
|
2005-07-19 09:54:05 +00:00
|
|
|
\(VAR . FORM). Symbols are set to nil and for cons cells VAR is set
|
|
|
|
to the value obtained by evaluating FORM."
|
2003-04-09 01:37:56 +00:00
|
|
|
:type '(repeat (restricted-sexp :match-alternatives (symbolp consp)))
|
2004-11-11 19:02:56 +00:00
|
|
|
:group 'desktop
|
2005-02-09 15:50:47 +00:00
|
|
|
:version "22.1")
|
2003-04-09 01:37:56 +00:00
|
|
|
|
2005-08-10 19:38:52 +00:00
|
|
|
(defcustom desktop-clear-preserve-buffers
|
2010-06-03 06:07:39 +00:00
|
|
|
'("\\*scratch\\*" "\\*Messages\\*" "\\*server\\*" "\\*tramp/.+\\*"
|
|
|
|
"\\*Warnings\\*")
|
2008-12-03 05:48:14 +00:00
|
|
|
"List of buffers that `desktop-clear' should not delete.
|
2005-08-10 19:38:52 +00:00
|
|
|
Each element is a regular expression. Buffers with a name matched by any of
|
|
|
|
these won't be deleted."
|
2010-06-03 06:07:39 +00:00
|
|
|
:version "23.3" ; added Warnings - bug#6336
|
2019-12-21 17:52:06 +00:00
|
|
|
:type '(repeat regexp)
|
2003-04-09 01:37:56 +00:00
|
|
|
:group 'desktop)
|
2004-09-09 19:45:03 +00:00
|
|
|
|
2005-08-10 19:38:52 +00:00
|
|
|
;;;###autoload
|
2004-09-09 19:45:03 +00:00
|
|
|
(defcustom desktop-locals-to-save
|
|
|
|
'(desktop-locals-to-save ; Itself! Think it over.
|
|
|
|
truncate-lines
|
|
|
|
case-fold-search
|
|
|
|
case-replace
|
|
|
|
fill-column
|
|
|
|
overwrite-mode
|
|
|
|
change-log-default-name
|
|
|
|
line-number-mode
|
2005-08-10 19:38:52 +00:00
|
|
|
column-number-mode
|
|
|
|
size-indication-mode
|
|
|
|
buffer-file-coding-system
|
2016-10-16 03:14:48 +00:00
|
|
|
buffer-display-time
|
2005-08-10 19:38:52 +00:00
|
|
|
indent-tabs-mode
|
2006-06-23 21:42:33 +00:00
|
|
|
tab-width
|
2005-08-10 19:38:52 +00:00
|
|
|
indicate-buffer-boundaries
|
|
|
|
indicate-empty-lines
|
|
|
|
show-trailing-whitespace)
|
1995-01-30 06:14:33 +00:00
|
|
|
"List of local variables to save for each buffer.
|
2005-08-10 19:38:52 +00:00
|
|
|
The variables are saved only when they really are local. Conventional minor
|
|
|
|
modes are restored automatically; they should not be listed here."
|
2004-04-16 12:51:06 +00:00
|
|
|
:type '(repeat symbol)
|
|
|
|
:group 'desktop)
|
1994-01-06 11:34:51 +00:00
|
|
|
|
2014-02-07 07:51:56 +00:00
|
|
|
(defcustom desktop-buffers-not-to-save "\\` "
|
2016-12-23 09:36:04 +00:00
|
|
|
"Regexp identifying buffers that are to be excluded from saving.
|
|
|
|
This is in effect only for buffers that don't visit files.
|
|
|
|
To exclude buffers that visit files, use `desktop-files-not-to-save'
|
|
|
|
or `desktop-modes-not-to-save'."
|
2009-07-18 11:59:04 +00:00
|
|
|
:type '(choice (const :tag "None" nil)
|
|
|
|
regexp)
|
2014-02-07 07:51:56 +00:00
|
|
|
:version "24.4" ; skip invisible temporary buffers
|
2003-04-09 01:37:56 +00:00
|
|
|
:group 'desktop)
|
1993-06-01 20:09:25 +00:00
|
|
|
|
2004-04-16 12:51:06 +00:00
|
|
|
;; Skip tramp and ange-ftp files
|
1997-04-12 03:18:33 +00:00
|
|
|
(defcustom desktop-files-not-to-save
|
2018-03-14 16:14:01 +00:00
|
|
|
"\\(\\`/[^/:]*:\\|(ftp)\\'\\)"
|
2018-02-17 11:01:19 +00:00
|
|
|
"Regexp identifying files whose buffers are to be excluded from saving.
|
|
|
|
The default value excludes buffers visiting remote files."
|
2009-07-18 11:59:04 +00:00
|
|
|
:type '(choice (const :tag "None" nil)
|
|
|
|
regexp)
|
1997-04-12 03:18:33 +00:00
|
|
|
:group 'desktop)
|
1994-05-01 02:07:27 +00:00
|
|
|
|
2005-10-21 08:48:53 +00:00
|
|
|
;; We skip TAGS files to save time (tags-file-name is saved instead).
|
|
|
|
(defcustom desktop-modes-not-to-save
|
|
|
|
'(tags-table-mode)
|
2000-10-10 16:42:37 +00:00
|
|
|
"List of major modes whose buffers should not be saved."
|
|
|
|
:type '(repeat symbol)
|
|
|
|
:group 'desktop)
|
|
|
|
|
2013-07-15 00:07:51 +00:00
|
|
|
(defcustom desktop-restore-frames t
|
2014-03-12 07:14:30 +00:00
|
|
|
"When non-nil, save and restore the frame and window configuration.
|
|
|
|
See related options `desktop-restore-reuses-frames',
|
|
|
|
`desktop-restore-in-current-display', and `desktop-restore-forces-onscreen'."
|
2013-06-27 09:08:14 +00:00
|
|
|
:type 'boolean
|
|
|
|
:group 'desktop
|
|
|
|
:version "24.4")
|
|
|
|
|
2016-05-30 05:45:33 +00:00
|
|
|
(defcustom desktop-restore-in-current-display t
|
2014-03-12 07:14:30 +00:00
|
|
|
"Controls how restoring of frames treats displays.
|
|
|
|
If t, restores frames into the current display.
|
|
|
|
If nil, restores frames into their original displays (if possible).
|
|
|
|
If `delete', deletes frames on other displays instead of restoring them."
|
2013-07-15 00:07:51 +00:00
|
|
|
:type '(choice (const :tag "Restore in current display" t)
|
|
|
|
(const :tag "Restore in original display" nil)
|
2013-12-28 01:24:15 +00:00
|
|
|
(const :tag "Delete frames in other displays" delete))
|
2013-07-15 00:07:51 +00:00
|
|
|
:group 'desktop
|
|
|
|
:version "24.4")
|
|
|
|
|
2013-07-28 03:03:45 +00:00
|
|
|
(defcustom desktop-restore-forces-onscreen t
|
2014-03-12 07:14:30 +00:00
|
|
|
"If t, restores frames that are fully offscreen onscreen instead.
|
|
|
|
If `all', also restores frames that are partially offscreen onscreen.
|
|
|
|
|
|
|
|
Note that checking of frame boundaries is only approximate.
|
|
|
|
It can fail to reliably detect frames whose onscreen/offscreen state
|
|
|
|
depends on a few pixels, especially near the right / bottom borders
|
|
|
|
of the screen."
|
2013-07-28 03:03:45 +00:00
|
|
|
:type '(choice (const :tag "Only fully offscreen frames" t)
|
2014-03-11 00:46:07 +00:00
|
|
|
(const :tag "Also partially offscreen frames" all)
|
2013-07-28 03:03:45 +00:00
|
|
|
(const :tag "Do not force frames onscreen" nil))
|
|
|
|
:group 'desktop
|
|
|
|
:version "24.4")
|
|
|
|
|
lisp/desktop.el: Move code related to saving frames to frameset.el.
Require frameset.
(desktop-restore-frames): Doc fix.
(desktop-restore-reuses-frames): Rename from
desktop-restoring-reuses-frames.
(desktop-saved-frameset): Rename from desktop-saved-frame-states.
(desktop-clear): Clear frames too.
(desktop-filter-parameters-alist): Set from frameset-filter-alist.
(desktop--filter-tty*, desktop-save, desktop-read):
Use frameset functions.
(desktop-before-saving-frames-functions, desktop--filter-*-color)
(desktop--filter-minibuffer, desktop--filter-restore-desktop-parm)
(desktop--filter-save-desktop-parm, desktop--filter-iconified-position)
(desktop-restore-in-original-display-p, desktop--filter-frame-parms)
(desktop--process-minibuffer-frames, desktop-save-frames)
(desktop--reuse-list, desktop--compute-pos, desktop--move-onscreen)
(desktop--find-frame, desktop--select-frame, desktop--make-frame)
(desktop--sort-states, desktop-restoring-frames-p)
(desktop-restore-frames): Remove. Most code moved to frameset.el.
(desktop-restoring-frameset-p, desktop-restore-frameset)
(desktop--check-dont-save, desktop-save-frameset): New functions.
(desktop--app-id): New constant.
(desktop-first-buffer, desktop-buffer-ok-count)
(desktop-buffer-fail-count): Move before first use.
lisp/frameset.el: New file.
2013-08-02 04:33:58 +00:00
|
|
|
(defcustom desktop-restore-reuses-frames t
|
2013-07-15 00:07:51 +00:00
|
|
|
"If t, restoring frames reuses existing frames.
|
2014-03-12 07:14:30 +00:00
|
|
|
If nil, deletes existing frames.
|
|
|
|
If `keep', keeps existing frames and does not reuse them."
|
2013-07-15 00:07:51 +00:00
|
|
|
:type '(choice (const :tag "Reuse existing frames" t)
|
|
|
|
(const :tag "Delete existing frames" nil)
|
2013-08-04 22:12:18 +00:00
|
|
|
(const :tag "Keep existing frames" :keep))
|
2013-07-01 03:29:46 +00:00
|
|
|
:group 'desktop
|
|
|
|
:version "24.4")
|
|
|
|
|
2003-04-09 01:37:56 +00:00
|
|
|
(defcustom desktop-file-name-format 'absolute
|
2008-12-03 05:48:14 +00:00
|
|
|
"Format in which desktop file names should be saved.
|
2003-04-09 01:37:56 +00:00
|
|
|
Possible values are:
|
|
|
|
absolute -- Absolute file name.
|
|
|
|
tilde -- Relative to ~.
|
|
|
|
local -- Relative to directory of desktop file."
|
|
|
|
:type '(choice (const absolute) (const tilde) (const local))
|
2004-11-11 19:02:56 +00:00
|
|
|
:group 'desktop
|
2005-02-09 15:50:47 +00:00
|
|
|
:version "22.1")
|
1996-03-05 16:37:03 +00:00
|
|
|
|
2005-01-07 20:18:59 +00:00
|
|
|
(defcustom desktop-restore-eager t
|
|
|
|
"Number of buffers to restore immediately.
|
|
|
|
Remaining buffers are restored lazily (when Emacs is idle).
|
|
|
|
If value is t, all buffers are restored immediately."
|
2005-01-09 13:31:53 +00:00
|
|
|
:type '(choice (const t) integer)
|
2005-01-07 20:18:59 +00:00
|
|
|
:group 'desktop
|
2005-02-09 15:50:47 +00:00
|
|
|
:version "22.1")
|
2005-01-07 20:18:59 +00:00
|
|
|
|
|
|
|
(defcustom desktop-lazy-verbose t
|
|
|
|
"Verbose reporting of lazily created buffers."
|
|
|
|
:type 'boolean
|
|
|
|
:group 'desktop
|
2005-02-09 15:50:47 +00:00
|
|
|
:version "22.1")
|
2005-01-07 20:18:59 +00:00
|
|
|
|
|
|
|
(defcustom desktop-lazy-idle-delay 5
|
|
|
|
"Idle delay before starting to create buffers.
|
|
|
|
See `desktop-restore-eager'."
|
|
|
|
:type 'integer
|
|
|
|
:group 'desktop
|
2005-02-09 15:50:47 +00:00
|
|
|
:version "22.1")
|
2005-01-07 20:18:59 +00:00
|
|
|
|
2004-04-21 20:53:35 +00:00
|
|
|
;;;###autoload
|
2013-07-12 11:21:01 +00:00
|
|
|
(defvar-local desktop-save-buffer nil
|
2004-04-26 18:58:19 +00:00
|
|
|
"When non-nil, save buffer status in desktop file.
|
|
|
|
|
2005-07-29 10:25:15 +00:00
|
|
|
If the value is a function, it is called by `desktop-save' with argument
|
|
|
|
DESKTOP-DIRNAME to obtain auxiliary information to save in the desktop
|
2004-04-26 18:58:19 +00:00
|
|
|
file along with the state of the buffer for which it was called.
|
2000-10-13 09:11:16 +00:00
|
|
|
|
2004-04-16 12:51:06 +00:00
|
|
|
When file names are returned, they should be formatted using the call
|
2004-04-21 20:53:35 +00:00
|
|
|
\"(desktop-file-name FILE-NAME DESKTOP-DIRNAME)\".
|
2003-04-09 01:37:56 +00:00
|
|
|
|
2005-08-10 19:38:52 +00:00
|
|
|
Later, when `desktop-read' evaluates the desktop file, auxiliary information
|
|
|
|
is passed as the argument DESKTOP-BUFFER-MISC to functions in
|
|
|
|
`desktop-buffer-mode-handlers'.")
|
2000-10-13 09:11:16 +00:00
|
|
|
|
2005-08-10 19:38:52 +00:00
|
|
|
;;;###autoload
|
2012-06-21 07:15:42 +00:00
|
|
|
(defvar desktop-buffer-mode-handlers nil
|
2004-04-21 20:53:35 +00:00
|
|
|
"Alist of major mode specific functions to restore a desktop buffer.
|
2005-08-10 19:38:52 +00:00
|
|
|
Functions listed are called by `desktop-create-buffer' when `desktop-read'
|
|
|
|
evaluates the desktop file. List elements must have the form
|
|
|
|
|
|
|
|
(MAJOR-MODE . RESTORE-BUFFER-FUNCTION).
|
2004-04-21 20:53:35 +00:00
|
|
|
|
|
|
|
Buffers with a major mode not specified here, are restored by the default
|
|
|
|
handler `desktop-restore-file-buffer'.
|
|
|
|
|
2004-05-07 17:58:24 +00:00
|
|
|
Handlers are called with argument list
|
2003-04-09 01:37:56 +00:00
|
|
|
|
2004-05-07 19:41:11 +00:00
|
|
|
(DESKTOP-BUFFER-FILE-NAME DESKTOP-BUFFER-NAME DESKTOP-BUFFER-MISC)
|
2004-04-21 20:53:35 +00:00
|
|
|
|
|
|
|
Furthermore, they may use the following variables:
|
2003-04-09 01:37:56 +00:00
|
|
|
|
2014-03-10 02:18:29 +00:00
|
|
|
`desktop-file-version'
|
|
|
|
`desktop-buffer-major-mode'
|
|
|
|
`desktop-buffer-minor-modes'
|
|
|
|
`desktop-buffer-point'
|
|
|
|
`desktop-buffer-mark'
|
|
|
|
`desktop-buffer-read-only'
|
|
|
|
`desktop-buffer-locals'
|
2003-04-09 01:37:56 +00:00
|
|
|
|
2004-04-21 20:53:35 +00:00
|
|
|
If a handler returns a buffer, then the saved mode settings
|
2005-08-10 19:38:52 +00:00
|
|
|
and variable values for that buffer are copied into it.
|
|
|
|
|
|
|
|
Modules that define a major mode that needs a special handler should contain
|
|
|
|
code like
|
1994-01-06 11:34:51 +00:00
|
|
|
|
2005-08-10 19:38:52 +00:00
|
|
|
(defun foo-restore-desktop-buffer
|
|
|
|
...
|
2015-11-17 23:28:50 +00:00
|
|
|
(add-to-list \\='desktop-buffer-mode-handlers
|
|
|
|
\\='(foo-mode . foo-restore-desktop-buffer))
|
2005-08-10 19:38:52 +00:00
|
|
|
|
2015-05-26 06:27:55 +00:00
|
|
|
The major mode function must either be autoloaded, or of the form
|
|
|
|
\"foobar-mode\" and defined in library \"foobar\", so that desktop
|
|
|
|
can guess how to load the mode's definition.")
|
1994-01-06 11:34:51 +00:00
|
|
|
|
2005-08-14 23:55:03 +00:00
|
|
|
;;;###autoload
|
2004-04-21 20:53:35 +00:00
|
|
|
(put 'desktop-buffer-mode-handlers 'risky-local-variable t)
|
2000-10-13 09:11:16 +00:00
|
|
|
|
2000-04-26 17:33:02 +00:00
|
|
|
(defcustom desktop-minor-mode-table
|
2018-03-14 16:14:01 +00:00
|
|
|
'((defining-kbd-macro nil)
|
2014-07-03 23:48:24 +00:00
|
|
|
(isearch-mode nil)
|
2005-12-14 07:44:44 +00:00
|
|
|
(vc-mode nil)
|
2020-03-29 22:34:47 +00:00
|
|
|
(vc-dir-mode nil)
|
2008-04-28 08:06:51 +00:00
|
|
|
(erc-track-minor-mode nil)
|
|
|
|
(savehist-mode nil))
|
2000-04-26 17:33:02 +00:00
|
|
|
"Table mapping minor mode variables to minor mode functions.
|
|
|
|
Each entry has the form (NAME RESTORE-FUNCTION).
|
|
|
|
NAME is the name of the buffer-local variable indicating that the minor
|
|
|
|
mode is active. RESTORE-FUNCTION is the function to activate the minor mode.
|
2007-06-09 00:09:03 +00:00
|
|
|
RESTORE-FUNCTION nil means don't try to restore the minor mode.
|
2000-04-26 17:33:02 +00:00
|
|
|
Only minor modes for which the name of the buffer-local variable
|
2004-05-31 21:45:51 +00:00
|
|
|
and the name of the minor mode function are different have to be added to
|
2005-08-10 19:38:52 +00:00
|
|
|
this table. See also `desktop-minor-mode-handlers'."
|
2016-01-30 19:48:18 +00:00
|
|
|
:type '(alist :key-type (symbol :tag "Minor mode")
|
|
|
|
:value-type (list :tag "Restore function"
|
|
|
|
(choice (const nil) function)))
|
2000-04-26 17:33:02 +00:00
|
|
|
:group 'desktop)
|
|
|
|
|
2005-08-10 19:38:52 +00:00
|
|
|
;;;###autoload
|
2012-06-21 07:15:42 +00:00
|
|
|
(defvar desktop-minor-mode-handlers nil
|
2005-08-10 19:38:52 +00:00
|
|
|
"Alist of functions to restore non-standard minor modes.
|
|
|
|
Functions are called by `desktop-create-buffer' to restore minor modes.
|
|
|
|
List elements must have the form
|
|
|
|
|
|
|
|
(MINOR-MODE . RESTORE-FUNCTION).
|
|
|
|
|
|
|
|
Minor modes not specified here, are restored by the standard minor mode
|
|
|
|
function.
|
|
|
|
|
|
|
|
Handlers are called with argument list
|
|
|
|
|
|
|
|
(DESKTOP-BUFFER-LOCALS)
|
|
|
|
|
|
|
|
Furthermore, they may use the following variables:
|
|
|
|
|
2014-03-10 02:18:29 +00:00
|
|
|
`desktop-file-version'
|
|
|
|
`desktop-buffer-file-name'
|
|
|
|
`desktop-buffer-name'
|
|
|
|
`desktop-buffer-major-mode'
|
|
|
|
`desktop-buffer-minor-modes'
|
|
|
|
`desktop-buffer-point'
|
|
|
|
`desktop-buffer-mark'
|
|
|
|
`desktop-buffer-read-only'
|
|
|
|
`desktop-buffer-misc'
|
2005-08-10 19:38:52 +00:00
|
|
|
|
|
|
|
When a handler is called, the buffer has been created and the major mode has
|
|
|
|
been set, but local variables listed in desktop-buffer-locals has not yet been
|
|
|
|
created and set.
|
|
|
|
|
|
|
|
Modules that define a minor mode that needs a special handler should contain
|
|
|
|
code like
|
|
|
|
|
|
|
|
(defun foo-desktop-restore
|
|
|
|
...
|
2015-11-17 23:28:50 +00:00
|
|
|
(add-to-list \\='desktop-minor-mode-handlers
|
|
|
|
\\='(foo-mode . foo-desktop-restore))
|
2005-08-10 19:38:52 +00:00
|
|
|
|
2015-05-26 06:27:55 +00:00
|
|
|
The minor mode function must either be autoloaded, or of the form
|
|
|
|
\"foobar-mode\" and defined in library \"foobar\", so that desktop
|
|
|
|
can guess how to load the mode's definition.
|
2005-08-10 19:38:52 +00:00
|
|
|
|
|
|
|
See also `desktop-minor-mode-table'.")
|
|
|
|
|
2005-08-14 23:55:03 +00:00
|
|
|
;;;###autoload
|
2005-08-10 19:38:52 +00:00
|
|
|
(put 'desktop-minor-mode-handlers 'risky-local-variable t)
|
|
|
|
|
1993-10-07 16:50:26 +00:00
|
|
|
;; ----------------------------------------------------------------------------
|
|
|
|
(defvar desktop-dirname nil
|
2004-04-16 12:51:06 +00:00
|
|
|
"The directory in which the desktop file should be saved.")
|
1993-06-01 20:09:25 +00:00
|
|
|
|
2006-06-23 21:42:33 +00:00
|
|
|
(defun desktop-full-file-name (&optional dirname)
|
|
|
|
"Return the full name of the desktop file in DIRNAME.
|
|
|
|
DIRNAME omitted or nil means use `desktop-dirname'."
|
|
|
|
(expand-file-name desktop-base-file-name (or dirname desktop-dirname)))
|
|
|
|
|
2007-06-12 09:11:31 +00:00
|
|
|
(defun desktop-full-lock-name (&optional dirname)
|
|
|
|
"Return the full name of the desktop lock file in DIRNAME.
|
|
|
|
DIRNAME omitted or nil means use `desktop-dirname'."
|
|
|
|
(expand-file-name desktop-base-lock-name (or dirname desktop-dirname)))
|
|
|
|
|
1993-06-01 20:09:25 +00:00
|
|
|
(defconst desktop-header
|
1993-10-07 16:50:26 +00:00
|
|
|
";; --------------------------------------------------------------------------
|
|
|
|
;; Desktop File for Emacs
|
|
|
|
;; --------------------------------------------------------------------------
|
2019-05-30 11:05:46 +00:00
|
|
|
" "Header to place in Desktop file.")
|
1994-02-05 02:23:44 +00:00
|
|
|
|
|
|
|
(defvar desktop-delay-hook nil
|
|
|
|
"Hooks run after all buffers are loaded; intended for internal use.")
|
1997-12-29 20:58:19 +00:00
|
|
|
|
2013-04-27 20:55:00 +00:00
|
|
|
(defvar desktop-file-checksum nil
|
|
|
|
"Checksum of the last auto-saved contents of the desktop file.
|
|
|
|
Used to avoid writing contents unchanged between auto-saves.")
|
|
|
|
|
lisp/desktop.el: Move code related to saving frames to frameset.el.
Require frameset.
(desktop-restore-frames): Doc fix.
(desktop-restore-reuses-frames): Rename from
desktop-restoring-reuses-frames.
(desktop-saved-frameset): Rename from desktop-saved-frame-states.
(desktop-clear): Clear frames too.
(desktop-filter-parameters-alist): Set from frameset-filter-alist.
(desktop--filter-tty*, desktop-save, desktop-read):
Use frameset functions.
(desktop-before-saving-frames-functions, desktop--filter-*-color)
(desktop--filter-minibuffer, desktop--filter-restore-desktop-parm)
(desktop--filter-save-desktop-parm, desktop--filter-iconified-position)
(desktop-restore-in-original-display-p, desktop--filter-frame-parms)
(desktop--process-minibuffer-frames, desktop-save-frames)
(desktop--reuse-list, desktop--compute-pos, desktop--move-onscreen)
(desktop--find-frame, desktop--select-frame, desktop--make-frame)
(desktop--sort-states, desktop-restoring-frames-p)
(desktop-restore-frames): Remove. Most code moved to frameset.el.
(desktop-restoring-frameset-p, desktop-restore-frameset)
(desktop--check-dont-save, desktop-save-frameset): New functions.
(desktop--app-id): New constant.
(desktop-first-buffer, desktop-buffer-ok-count)
(desktop-buffer-fail-count): Move before first use.
lisp/frameset.el: New file.
2013-08-02 04:33:58 +00:00
|
|
|
(defvar desktop-saved-frameset nil
|
2013-07-21 17:45:12 +00:00
|
|
|
"Saved state of all frames.
|
|
|
|
Only valid during frame saving & restoring; intended for internal use.")
|
2013-06-27 09:08:14 +00:00
|
|
|
|
2007-06-12 09:11:31 +00:00
|
|
|
;; ----------------------------------------------------------------------------
|
|
|
|
;; Desktop file conflict detection
|
|
|
|
(defvar desktop-file-modtime nil
|
|
|
|
"When the desktop file was last modified to the knowledge of this Emacs.
|
|
|
|
Used to detect desktop file conflicts.")
|
|
|
|
|
2015-02-09 13:25:53 +00:00
|
|
|
(defvar desktop-var-serdes-funs
|
|
|
|
(list (list
|
|
|
|
'mark-ring
|
|
|
|
(lambda (mr)
|
|
|
|
(mapcar #'marker-position mr))
|
|
|
|
(lambda (mr)
|
|
|
|
(mapcar #'copy-marker mr))))
|
|
|
|
"Table of serialization/deserialization functions for variables.
|
|
|
|
Each record is a list of form: (var serializer deserializer).
|
|
|
|
These records can be freely reordered, deleted, or new ones added.
|
|
|
|
However, for compatibility, don't modify the functions for existing records.")
|
|
|
|
|
2007-06-12 09:11:31 +00:00
|
|
|
(defun desktop-owner (&optional dirname)
|
|
|
|
"Return the PID of the Emacs process that owns the desktop file in DIRNAME.
|
|
|
|
Return nil if no desktop file found or no Emacs process is using it.
|
|
|
|
DIRNAME omitted or nil means use `desktop-dirname'."
|
2013-07-12 11:21:01 +00:00
|
|
|
(let (owner
|
|
|
|
(file (desktop-full-lock-name dirname)))
|
|
|
|
(and (file-exists-p file)
|
|
|
|
(ignore-errors
|
|
|
|
(with-temp-buffer
|
|
|
|
(insert-file-contents-literally file)
|
|
|
|
(goto-char (point-min))
|
|
|
|
(setq owner (read (current-buffer)))
|
|
|
|
(integerp owner)))
|
2007-06-12 09:11:31 +00:00
|
|
|
owner)))
|
|
|
|
|
|
|
|
(defun desktop-claim-lock (&optional dirname)
|
|
|
|
"Record this Emacs process as the owner of the desktop file in DIRNAME.
|
|
|
|
DIRNAME omitted or nil means use `desktop-dirname'."
|
|
|
|
(write-region (number-to-string (emacs-pid)) nil
|
|
|
|
(desktop-full-lock-name dirname)))
|
|
|
|
|
|
|
|
(defun desktop-release-lock (&optional dirname)
|
|
|
|
"Remove the lock file for the desktop in DIRNAME.
|
|
|
|
DIRNAME omitted or nil means use `desktop-dirname'."
|
|
|
|
(let ((file (desktop-full-lock-name dirname)))
|
|
|
|
(when (file-exists-p file) (delete-file file))))
|
|
|
|
|
1993-10-07 16:50:26 +00:00
|
|
|
;; ----------------------------------------------------------------------------
|
2004-04-16 12:51:06 +00:00
|
|
|
(defun desktop-truncate (list n)
|
1994-01-06 11:34:51 +00:00
|
|
|
"Truncate LIST to at most N elements destructively."
|
2004-04-16 12:51:06 +00:00
|
|
|
(let ((here (nthcdr (1- n) list)))
|
2007-06-12 11:14:52 +00:00
|
|
|
(when (consp here)
|
|
|
|
(setcdr here nil))))
|
1997-07-04 00:13:36 +00:00
|
|
|
|
2003-04-09 01:37:56 +00:00
|
|
|
;; ----------------------------------------------------------------------------
|
2006-06-23 21:42:33 +00:00
|
|
|
;;;###autoload
|
1997-07-04 00:13:36 +00:00
|
|
|
(defun desktop-clear ()
|
|
|
|
"Empty the Desktop.
|
2005-08-10 19:38:52 +00:00
|
|
|
This kills all buffers except for internal ones and those with names matched by
|
|
|
|
a regular expression in the list `desktop-clear-preserve-buffers'.
|
2013-08-04 00:31:33 +00:00
|
|
|
Furthermore, it clears the variables listed in `desktop-globals-to-clear'.
|
|
|
|
When called interactively and `desktop-restore-frames' is non-nil, it also
|
|
|
|
deletes all frames except the selected one (and its minibuffer frame,
|
|
|
|
if different)."
|
1993-06-01 20:09:25 +00:00
|
|
|
(interactive)
|
2005-01-07 20:18:59 +00:00
|
|
|
(desktop-lazy-abort)
|
2016-01-18 13:32:22 +00:00
|
|
|
(setq desktop-io-file-version nil)
|
2003-04-09 01:37:56 +00:00
|
|
|
(dolist (var desktop-globals-to-clear)
|
|
|
|
(if (symbolp var)
|
2017-08-08 19:10:49 +00:00
|
|
|
(set-default var nil)
|
|
|
|
(set-default var (eval (cdr var)))))
|
2018-03-14 16:14:01 +00:00
|
|
|
(let ((preserve-regexp (concat "\\`\\("
|
2005-08-10 19:38:52 +00:00
|
|
|
(mapconcat (lambda (regexp)
|
|
|
|
(concat "\\(" regexp "\\)"))
|
|
|
|
desktop-clear-preserve-buffers
|
|
|
|
"\\|")
|
2018-03-14 16:14:01 +00:00
|
|
|
"\\)\\'")))
|
2013-07-23 01:10:54 +00:00
|
|
|
(dolist (buffer (buffer-list))
|
|
|
|
(let ((bufname (buffer-name buffer)))
|
2013-07-23 23:10:58 +00:00
|
|
|
(unless (or (eq (aref bufname 0) ?\s) ;; Don't kill internal buffers
|
2013-07-23 01:10:54 +00:00
|
|
|
(string-match-p preserve-regexp bufname))
|
|
|
|
(kill-buffer buffer)))))
|
lisp/desktop.el: Move code related to saving frames to frameset.el.
Require frameset.
(desktop-restore-frames): Doc fix.
(desktop-restore-reuses-frames): Rename from
desktop-restoring-reuses-frames.
(desktop-saved-frameset): Rename from desktop-saved-frame-states.
(desktop-clear): Clear frames too.
(desktop-filter-parameters-alist): Set from frameset-filter-alist.
(desktop--filter-tty*, desktop-save, desktop-read):
Use frameset functions.
(desktop-before-saving-frames-functions, desktop--filter-*-color)
(desktop--filter-minibuffer, desktop--filter-restore-desktop-parm)
(desktop--filter-save-desktop-parm, desktop--filter-iconified-position)
(desktop-restore-in-original-display-p, desktop--filter-frame-parms)
(desktop--process-minibuffer-frames, desktop-save-frames)
(desktop--reuse-list, desktop--compute-pos, desktop--move-onscreen)
(desktop--find-frame, desktop--select-frame, desktop--make-frame)
(desktop--sort-states, desktop-restoring-frames-p)
(desktop-restore-frames): Remove. Most code moved to frameset.el.
(desktop-restoring-frameset-p, desktop-restore-frameset)
(desktop--check-dont-save, desktop-save-frameset): New functions.
(desktop--app-id): New constant.
(desktop-first-buffer, desktop-buffer-ok-count)
(desktop-buffer-fail-count): Move before first use.
lisp/frameset.el: New file.
2013-08-02 04:33:58 +00:00
|
|
|
(delete-other-windows)
|
2013-08-04 00:31:33 +00:00
|
|
|
(when (and desktop-restore-frames
|
|
|
|
;; Non-interactive calls to desktop-clear happen before desktop-read
|
|
|
|
;; which already takes care of frame restoration and deletion.
|
|
|
|
(called-interactively-p 'any))
|
|
|
|
(let* ((this (selected-frame))
|
2013-08-16 05:15:51 +00:00
|
|
|
(mini (window-frame (minibuffer-window this)))) ; in case they differ
|
2013-08-05 04:45:17 +00:00
|
|
|
(dolist (frame (sort (frame-list) #'frameset-minibufferless-first-p))
|
2013-08-04 00:31:33 +00:00
|
|
|
(condition-case err
|
|
|
|
(unless (or (eq frame this)
|
|
|
|
(eq frame mini)
|
2017-06-05 03:54:51 +00:00
|
|
|
;; Don't delete daemon's initial frame, or
|
|
|
|
;; we'll never be able to close the last
|
|
|
|
;; client's frame (Bug#26912).
|
|
|
|
(if (daemonp) (not (frame-parameter frame 'client)))
|
2013-08-04 00:31:33 +00:00
|
|
|
(frame-parameter frame 'desktop-dont-clear))
|
|
|
|
(delete-frame frame))
|
|
|
|
(error
|
2014-03-11 00:46:07 +00:00
|
|
|
(delay-warning 'desktop (error-message-string err))))))))
|
2003-04-09 01:37:56 +00:00
|
|
|
|
1993-10-07 16:50:26 +00:00
|
|
|
;; ----------------------------------------------------------------------------
|
2011-03-06 00:30:16 +00:00
|
|
|
(unless noninteractive
|
2018-03-14 16:14:01 +00:00
|
|
|
(add-hook 'kill-emacs-hook #'desktop-kill))
|
1994-01-06 11:34:51 +00:00
|
|
|
|
1993-06-01 20:09:25 +00:00
|
|
|
(defun desktop-kill ()
|
2004-04-16 12:51:06 +00:00
|
|
|
"If `desktop-save-mode' is non-nil, do what `desktop-save' says to do.
|
2003-04-09 01:37:56 +00:00
|
|
|
If the desktop should be saved and `desktop-dirname'
|
|
|
|
is nil, ask the user where to save the desktop."
|
2006-06-23 21:42:33 +00:00
|
|
|
(when (and desktop-save-mode
|
|
|
|
(let ((exists (file-exists-p (desktop-full-file-name))))
|
|
|
|
(or (eq desktop-save t)
|
2010-04-27 06:45:43 +00:00
|
|
|
(and exists (eq desktop-save 'if-exists))
|
|
|
|
;; If it exists, but we aren't using it, we are going
|
|
|
|
;; to ask for a new directory below.
|
|
|
|
(and exists desktop-dirname (eq desktop-save 'ask-if-new))
|
2006-06-23 21:42:33 +00:00
|
|
|
(and
|
|
|
|
(or (memq desktop-save '(ask ask-if-new))
|
|
|
|
(and exists (eq desktop-save 'ask-if-exists)))
|
|
|
|
(y-or-n-p "Save desktop? ")))))
|
2003-04-09 01:37:56 +00:00
|
|
|
(unless desktop-dirname
|
|
|
|
(setq desktop-dirname
|
2006-06-23 21:42:33 +00:00
|
|
|
(file-name-as-directory
|
|
|
|
(expand-file-name
|
2007-06-20 10:12:44 +00:00
|
|
|
(read-directory-name "Directory for desktop file: " nil nil t)))))
|
2003-04-09 01:37:56 +00:00
|
|
|
(condition-case err
|
2007-06-12 09:11:31 +00:00
|
|
|
(desktop-save desktop-dirname t)
|
2003-04-09 01:37:56 +00:00
|
|
|
(file-error
|
2006-06-23 21:42:33 +00:00
|
|
|
(unless (yes-or-no-p "Error while saving the desktop. Ignore? ")
|
2007-06-12 09:11:31 +00:00
|
|
|
(signal (car err) (cdr err))))))
|
|
|
|
;; If we own it, we don't anymore.
|
|
|
|
(when (eq (emacs-pid) (desktop-owner)) (desktop-release-lock)))
|
2003-04-09 01:37:56 +00:00
|
|
|
|
1993-10-07 16:50:26 +00:00
|
|
|
;; ----------------------------------------------------------------------------
|
1996-03-05 04:22:44 +00:00
|
|
|
(defun desktop-list* (&rest args)
|
2013-07-23 11:29:30 +00:00
|
|
|
(and args (apply #'cl-list* args)))
|
1996-03-05 04:22:44 +00:00
|
|
|
|
2007-06-12 09:11:31 +00:00
|
|
|
;; ----------------------------------------------------------------------------
|
|
|
|
(defun desktop-buffer-info (buffer)
|
2015-03-05 13:37:23 +00:00
|
|
|
"Return information describing BUFFER.
|
|
|
|
This function is not pure, as BUFFER is made current with
|
|
|
|
`set-buffer'.
|
|
|
|
|
|
|
|
Returns a list of all the necessary information to recreate the
|
|
|
|
buffer, which is (in order):
|
|
|
|
|
|
|
|
`uniquify-buffer-base-name';
|
|
|
|
`buffer-file-name';
|
|
|
|
`buffer-name';
|
|
|
|
`major-mode';
|
|
|
|
list of minor-modes,;
|
|
|
|
`point';
|
|
|
|
`mark';
|
|
|
|
`buffer-read-only';
|
|
|
|
auxiliary information given by `desktop-save-buffer';
|
|
|
|
local variables;
|
|
|
|
auxiliary information given by `desktop-var-serdes-funs'."
|
2007-06-12 09:11:31 +00:00
|
|
|
(set-buffer buffer)
|
2016-01-18 13:32:22 +00:00
|
|
|
`(
|
|
|
|
;; base name of the buffer; replaces the buffer name if managed by uniquify
|
|
|
|
,(and (fboundp 'uniquify-buffer-base-name) (uniquify-buffer-base-name))
|
|
|
|
;; basic information
|
|
|
|
,(desktop-file-name (buffer-file-name) desktop-dirname)
|
|
|
|
,(buffer-name)
|
|
|
|
,major-mode
|
|
|
|
;; minor modes
|
|
|
|
,(let (ret)
|
|
|
|
(dolist (minor-mode (mapcar #'car minor-mode-alist) ret)
|
|
|
|
(and (boundp minor-mode)
|
|
|
|
(symbol-value minor-mode)
|
|
|
|
(let* ((special (assq minor-mode desktop-minor-mode-table))
|
|
|
|
(value (cond (special (cadr special))
|
2018-03-14 16:14:01 +00:00
|
|
|
((get minor-mode :minor-mode-function))
|
2016-01-18 13:32:22 +00:00
|
|
|
((functionp minor-mode) minor-mode))))
|
|
|
|
(when value (cl-pushnew value ret))))))
|
|
|
|
;; point and mark, and read-only status
|
|
|
|
,(point)
|
|
|
|
,(list (mark t) mark-active)
|
|
|
|
,buffer-read-only
|
|
|
|
;; auxiliary information
|
|
|
|
,(when (functionp desktop-save-buffer)
|
|
|
|
(funcall desktop-save-buffer desktop-dirname))
|
|
|
|
;; local variables
|
|
|
|
,(let ((loclist (buffer-local-variables))
|
|
|
|
(ll nil))
|
|
|
|
(dolist (local desktop-locals-to-save)
|
|
|
|
(let ((here (assq local loclist)))
|
|
|
|
(cond (here
|
|
|
|
(push here ll))
|
|
|
|
((member local loclist)
|
|
|
|
(push local ll)))))
|
|
|
|
ll)
|
|
|
|
,@(when (>= desktop-io-file-version 208)
|
|
|
|
(list
|
|
|
|
(mapcar (lambda (record)
|
|
|
|
(let ((var (car record)))
|
|
|
|
(list var
|
|
|
|
(funcall (cadr record) (symbol-value var)))))
|
|
|
|
desktop-var-serdes-funs)))))
|
2007-06-12 09:11:31 +00:00
|
|
|
|
2003-04-09 01:37:56 +00:00
|
|
|
;; ----------------------------------------------------------------------------
|
2013-03-26 03:38:18 +00:00
|
|
|
(defun desktop--v2s (value)
|
|
|
|
"Convert VALUE to a pair (QUOTE . SEXP); (eval SEXP) gives VALUE.
|
|
|
|
SEXP is an sexp that when evaluated yields VALUE.
|
1995-01-30 06:14:33 +00:00
|
|
|
QUOTE may be `may' (value may be quoted),
|
2011-12-23 00:44:27 +00:00
|
|
|
`must' (value must be quoted), or nil (value must not be quoted)."
|
1994-02-05 02:23:44 +00:00
|
|
|
(cond
|
2007-06-12 11:14:52 +00:00
|
|
|
((or (numberp value) (null value) (eq t value) (keywordp value))
|
2013-03-26 03:38:18 +00:00
|
|
|
(cons 'may value))
|
2007-06-12 11:14:52 +00:00
|
|
|
((stringp value)
|
2018-04-19 20:30:46 +00:00
|
|
|
;; Get rid of unreadable text properties.
|
|
|
|
(if (condition-case nil (read (format "%S" value)) (error nil))
|
|
|
|
(cons 'may value)
|
|
|
|
(let ((copy (copy-sequence value)))
|
|
|
|
(set-text-properties 0 (length copy) nil copy)
|
|
|
|
(cons 'may copy))))
|
2007-06-12 11:14:52 +00:00
|
|
|
((symbolp value)
|
2013-03-26 03:38:18 +00:00
|
|
|
(cons 'must value))
|
2007-06-12 11:14:52 +00:00
|
|
|
((vectorp value)
|
2013-03-26 03:38:18 +00:00
|
|
|
(let* ((pass1 (mapcar #'desktop--v2s value))
|
|
|
|
(special (assq nil pass1)))
|
2007-06-12 11:14:52 +00:00
|
|
|
(if special
|
2013-03-26 03:38:18 +00:00
|
|
|
(cons nil `(vector
|
|
|
|
,@(mapcar (lambda (el)
|
|
|
|
(if (eq (car el) 'must)
|
|
|
|
`',(cdr el) (cdr el)))
|
|
|
|
pass1)))
|
|
|
|
(cons 'may `[,@(mapcar #'cdr pass1)]))))
|
2019-04-04 17:46:30 +00:00
|
|
|
((and (recordp value) (symbolp (aref value 0)))
|
|
|
|
(let* ((pass1 (let ((res ()))
|
|
|
|
(dotimes (i (length value))
|
|
|
|
(push (desktop--v2s (aref value i)) res))
|
|
|
|
(nreverse res)))
|
|
|
|
(special (assq nil pass1)))
|
|
|
|
(if special
|
|
|
|
(cons nil `(record
|
|
|
|
,@(mapcar (lambda (el)
|
|
|
|
(if (eq (car el) 'must)
|
|
|
|
`',(cdr el) (cdr el)))
|
|
|
|
pass1)))
|
|
|
|
(cons 'may (apply #'record (mapcar #'cdr pass1))))))
|
2007-06-12 11:14:52 +00:00
|
|
|
((consp value)
|
|
|
|
(let ((p value)
|
|
|
|
newlist
|
2013-07-12 11:21:01 +00:00
|
|
|
use-list*)
|
2007-06-12 11:14:52 +00:00
|
|
|
(while (consp p)
|
2013-03-26 03:38:18 +00:00
|
|
|
(let ((q.sexp (desktop--v2s (car p))))
|
|
|
|
(push q.sexp newlist))
|
2007-06-12 11:14:52 +00:00
|
|
|
(setq p (cdr p)))
|
2013-03-26 03:38:18 +00:00
|
|
|
(when p
|
|
|
|
(let ((last (desktop--v2s p)))
|
|
|
|
(setq use-list* t)
|
|
|
|
(push last newlist)))
|
|
|
|
(if (assq nil newlist)
|
2007-06-12 11:14:52 +00:00
|
|
|
(cons nil
|
2013-03-26 03:38:18 +00:00
|
|
|
`(,(if use-list* 'desktop-list* 'list)
|
|
|
|
,@(mapcar (lambda (el)
|
|
|
|
(if (eq (car el) 'must)
|
|
|
|
`',(cdr el) (cdr el)))
|
|
|
|
(nreverse newlist))))
|
2007-06-12 11:14:52 +00:00
|
|
|
(cons 'must
|
2013-03-26 03:38:18 +00:00
|
|
|
`(,@(mapcar #'cdr
|
|
|
|
(nreverse (if use-list* (cdr newlist) newlist)))
|
|
|
|
,@(if use-list* (cdar newlist)))))))
|
2007-06-12 11:14:52 +00:00
|
|
|
((subrp value)
|
2013-03-26 03:38:18 +00:00
|
|
|
(cons nil `(symbol-function
|
|
|
|
',(intern-soft (substring (prin1-to-string value) 7 -1)))))
|
2007-06-12 11:14:52 +00:00
|
|
|
((markerp value)
|
2013-03-26 03:38:18 +00:00
|
|
|
(let ((pos (marker-position value))
|
|
|
|
(buf (buffer-name (marker-buffer value))))
|
|
|
|
(cons nil
|
|
|
|
`(let ((mk (make-marker)))
|
|
|
|
(add-hook 'desktop-delay-hook
|
2018-03-14 16:14:01 +00:00
|
|
|
(lambda ()
|
|
|
|
(set-marker mk ,pos (get-buffer ,buf))))
|
2013-03-26 03:38:18 +00:00
|
|
|
mk))))
|
|
|
|
(t ; Save as text.
|
|
|
|
(cons 'may "Unprintable entity"))))
|
1994-02-05 02:23:44 +00:00
|
|
|
|
2003-04-09 01:37:56 +00:00
|
|
|
;; ----------------------------------------------------------------------------
|
2004-04-16 12:51:06 +00:00
|
|
|
(defun desktop-value-to-string (value)
|
1995-01-30 06:14:33 +00:00
|
|
|
"Convert VALUE to a string that when read evaluates to the same value.
|
|
|
|
Not all types of values are supported."
|
1994-02-05 02:23:44 +00:00
|
|
|
(let* ((print-escape-newlines t)
|
2014-04-27 08:22:11 +00:00
|
|
|
(print-length nil)
|
|
|
|
(print-level nil)
|
1994-02-05 02:23:44 +00:00
|
|
|
(float-output-format nil)
|
2013-03-26 03:38:18 +00:00
|
|
|
(quote.sexp (desktop--v2s value))
|
|
|
|
(quote (car quote.sexp))
|
2014-04-27 08:22:11 +00:00
|
|
|
(print-quoted t)
|
|
|
|
(txt (prin1-to-string (cdr quote.sexp))))
|
1994-02-05 02:23:44 +00:00
|
|
|
(if (eq quote 'must)
|
|
|
|
(concat "'" txt)
|
|
|
|
txt)))
|
2003-04-09 01:37:56 +00:00
|
|
|
|
1994-01-06 11:34:51 +00:00
|
|
|
;; ----------------------------------------------------------------------------
|
1995-10-08 19:37:04 +00:00
|
|
|
(defun desktop-outvar (varspec)
|
|
|
|
"Output a setq statement for variable VAR to the desktop file.
|
|
|
|
The argument VARSPEC may be the variable name VAR (a symbol),
|
2006-02-10 11:07:50 +00:00
|
|
|
or a cons cell of the form (VAR . MAX-SIZE),
|
1995-10-08 19:37:04 +00:00
|
|
|
which means to truncate VAR's value to at most MAX-SIZE elements
|
|
|
|
\(if the value is a list) before saving the value."
|
|
|
|
(let (var size)
|
|
|
|
(if (consp varspec)
|
|
|
|
(setq var (car varspec) size (cdr varspec))
|
|
|
|
(setq var varspec))
|
2007-06-12 11:14:52 +00:00
|
|
|
(when (boundp var)
|
|
|
|
(when (and (integerp size)
|
|
|
|
(> size 0)
|
|
|
|
(listp (eval var)))
|
|
|
|
(desktop-truncate (eval var) size))
|
|
|
|
(insert "(setq "
|
|
|
|
(symbol-name var)
|
|
|
|
" "
|
|
|
|
(desktop-value-to-string (symbol-value var))
|
|
|
|
")\n"))))
|
2003-04-09 01:37:56 +00:00
|
|
|
|
1993-10-07 16:50:26 +00:00
|
|
|
;; ----------------------------------------------------------------------------
|
2020-01-29 23:22:19 +00:00
|
|
|
(defvar desktop-buffers-not-to-save-function nil
|
|
|
|
"Function identifying buffers that are to be excluded from saving.
|
|
|
|
Like `desktop-buffers-not-to-save' it can be used to check whether
|
|
|
|
a given buffer should not be saved. It takes the same arguments as
|
|
|
|
`desktop-save-buffer-p' and should return nil if buffer should not
|
|
|
|
have its state saved in the desktop file.")
|
2019-12-02 23:40:12 +00:00
|
|
|
|
|
|
|
(defun desktop-save-buffer-p (filename bufname mode &rest rest)
|
2004-04-26 18:58:19 +00:00
|
|
|
"Return t if buffer should have its state saved in the desktop file.
|
1993-10-07 16:50:26 +00:00
|
|
|
FILENAME is the visited file name, BUFNAME is the buffer name, and
|
2006-02-10 11:07:50 +00:00
|
|
|
MODE is the major mode.
|
|
|
|
\n\(fn FILENAME BUFNAME MODE)"
|
2010-03-25 06:18:17 +00:00
|
|
|
(let ((case-fold-search nil)
|
2014-02-22 02:10:49 +00:00
|
|
|
(no-regexp-to-check (not (stringp desktop-files-not-to-save)))
|
|
|
|
dired-skip)
|
|
|
|
(and (or filename
|
|
|
|
(not (stringp desktop-buffers-not-to-save))
|
|
|
|
(not (string-match-p desktop-buffers-not-to-save bufname)))
|
|
|
|
(not (memq mode desktop-modes-not-to-save))
|
|
|
|
(or (and filename
|
|
|
|
(or no-regexp-to-check
|
|
|
|
(not (string-match-p desktop-files-not-to-save filename))))
|
|
|
|
(and (memq mode '(dired-mode vc-dir-mode))
|
|
|
|
(or no-regexp-to-check
|
|
|
|
(not (setq dired-skip
|
|
|
|
(with-current-buffer bufname
|
|
|
|
(string-match-p desktop-files-not-to-save
|
|
|
|
default-directory))))))
|
|
|
|
(and (null filename)
|
|
|
|
(null dired-skip) ; bug#5755
|
|
|
|
(with-current-buffer bufname desktop-save-buffer)))
|
2019-12-02 23:40:12 +00:00
|
|
|
(or (null desktop-buffers-not-to-save-function)
|
|
|
|
(funcall desktop-buffers-not-to-save-function
|
|
|
|
filename bufname mode rest))
|
2014-02-22 02:10:49 +00:00
|
|
|
t)))
|
2003-04-09 01:37:56 +00:00
|
|
|
|
1993-10-07 16:50:26 +00:00
|
|
|
;; ----------------------------------------------------------------------------
|
2003-04-09 01:37:56 +00:00
|
|
|
(defun desktop-file-name (filename dirname)
|
|
|
|
"Convert FILENAME to format specified in `desktop-file-name-format'.
|
|
|
|
DIRNAME must be the directory in which the desktop file will be saved."
|
|
|
|
(cond
|
|
|
|
((not filename) nil)
|
|
|
|
((eq desktop-file-name-format 'tilde)
|
|
|
|
(let ((relative-name (file-relative-name (expand-file-name filename) "~")))
|
|
|
|
(cond
|
|
|
|
((file-name-absolute-p relative-name) relative-name)
|
|
|
|
((string= "./" relative-name) "~/")
|
|
|
|
((string= "." relative-name) "~")
|
|
|
|
(t (concat "~/" relative-name)))))
|
|
|
|
((eq desktop-file-name-format 'local) (file-relative-name filename dirname))
|
|
|
|
(t (expand-file-name filename))))
|
2002-11-04 08:21:51 +00:00
|
|
|
|
2007-06-16 22:32:13 +00:00
|
|
|
|
2003-04-09 01:37:56 +00:00
|
|
|
;; ----------------------------------------------------------------------------
|
lisp/desktop.el: Move code related to saving frames to frameset.el.
Require frameset.
(desktop-restore-frames): Doc fix.
(desktop-restore-reuses-frames): Rename from
desktop-restoring-reuses-frames.
(desktop-saved-frameset): Rename from desktop-saved-frame-states.
(desktop-clear): Clear frames too.
(desktop-filter-parameters-alist): Set from frameset-filter-alist.
(desktop--filter-tty*, desktop-save, desktop-read):
Use frameset functions.
(desktop-before-saving-frames-functions, desktop--filter-*-color)
(desktop--filter-minibuffer, desktop--filter-restore-desktop-parm)
(desktop--filter-save-desktop-parm, desktop--filter-iconified-position)
(desktop-restore-in-original-display-p, desktop--filter-frame-parms)
(desktop--process-minibuffer-frames, desktop-save-frames)
(desktop--reuse-list, desktop--compute-pos, desktop--move-onscreen)
(desktop--find-frame, desktop--select-frame, desktop--make-frame)
(desktop--sort-states, desktop-restoring-frames-p)
(desktop-restore-frames): Remove. Most code moved to frameset.el.
(desktop-restoring-frameset-p, desktop-restore-frameset)
(desktop--check-dont-save, desktop-save-frameset): New functions.
(desktop--app-id): New constant.
(desktop-first-buffer, desktop-buffer-ok-count)
(desktop-buffer-fail-count): Move before first use.
lisp/frameset.el: New file.
2013-08-02 04:33:58 +00:00
|
|
|
(defun desktop--check-dont-save (frame)
|
|
|
|
(not (frame-parameter frame 'desktop-dont-save)))
|
|
|
|
|
|
|
|
(defconst desktop--app-id `(desktop . ,desktop-file-version))
|
|
|
|
|
|
|
|
(defun desktop-save-frameset ()
|
|
|
|
"Save the state of existing frames in `desktop-saved-frameset'.
|
2013-07-22 01:25:47 +00:00
|
|
|
Frames with a non-nil `desktop-dont-save' parameter are not saved."
|
lisp/desktop.el: Move code related to saving frames to frameset.el.
Require frameset.
(desktop-restore-frames): Doc fix.
(desktop-restore-reuses-frames): Rename from
desktop-restoring-reuses-frames.
(desktop-saved-frameset): Rename from desktop-saved-frame-states.
(desktop-clear): Clear frames too.
(desktop-filter-parameters-alist): Set from frameset-filter-alist.
(desktop--filter-tty*, desktop-save, desktop-read):
Use frameset functions.
(desktop-before-saving-frames-functions, desktop--filter-*-color)
(desktop--filter-minibuffer, desktop--filter-restore-desktop-parm)
(desktop--filter-save-desktop-parm, desktop--filter-iconified-position)
(desktop-restore-in-original-display-p, desktop--filter-frame-parms)
(desktop--process-minibuffer-frames, desktop-save-frames)
(desktop--reuse-list, desktop--compute-pos, desktop--move-onscreen)
(desktop--find-frame, desktop--select-frame, desktop--make-frame)
(desktop--sort-states, desktop-restoring-frames-p)
(desktop-restore-frames): Remove. Most code moved to frameset.el.
(desktop-restoring-frameset-p, desktop-restore-frameset)
(desktop--check-dont-save, desktop-save-frameset): New functions.
(desktop--app-id): New constant.
(desktop-first-buffer, desktop-buffer-ok-count)
(desktop-buffer-fail-count): Move before first use.
lisp/frameset.el: New file.
2013-08-02 04:33:58 +00:00
|
|
|
(setq desktop-saved-frameset
|
2013-07-01 03:29:46 +00:00
|
|
|
(and desktop-restore-frames
|
lisp/frameset.el: Convert `frameset' to vector and add new slots.
(frameset): Use type vector, not list (incompatible change).
Do not declare a new constructor, use the default one.
Upgrade suggested properties `app', `name' and `desc' to slots `app',
`name' and `description', respectively, and add read-only slot `timestamp'.
Doc fixes.
(frameset-copy, frameset-persistent-filter-alist)
(frameset-filter-alist, frameset-switch-to-gui-p)
(frameset-switch-to-tty-p, frameset-filter-tty-to-GUI)
(frameset-filter-sanitize-color, frameset-filter-minibuffer)
(frameset-filter-iconified, frameset-keep-original-display-p):
Doc fixes.
(frameset-filter-shelve-param, frameset-filter-unshelve-param):
Rename from frameset-filter-(save|restore)-param. All callers changed.
Doc fix.
(frameset-p): Adapt to change to vector and be more thorough.
Change arg name to OBJECT. Doc fix.
(frameset-prop): Rename arg PROP to PROPERTY. Doc fix.
(frameset-session-filter-alist): Rename from frameset-live-filter-alist.
All callers changed.
(frameset-frame-with-id): Rename from frameset-locate-frame-id.
All callers changed.
(frameset--record-minibuffer-relationships): Rename from
frameset--process-minibuffer-frames. All callers changed.
(frameset-save): Add new keyword arguments APP, NAME and DESCRIPTION.
Use new default constructor (again). Doc fix.
(frameset--find-frame-if): Rename from `frameset--find-frame.
All callers changed.
(frameset--reuse-frame): Rename arg FRAME-CFG to PARAMETERS.
(frameset--initial-params): Rename arg FRAME-CFG to PARAMETERS.
Doc fix.
(frameset--restore-frame): Rename args FRAME-CFG and WINDOW-CFG to
PARAMETERS and WINDOW-STATE, respectively.
(frameset-restore): Add new keyword argument PREDICATE.
Reset frameset--target-display to nil. Doc fix.
lisp/desktop.el (desktop-save-frameset): Use new frameset-save args.
Use lexical-binding.
2013-08-07 22:54:08 +00:00
|
|
|
(frameset-save nil
|
|
|
|
:app desktop--app-id
|
2014-12-29 20:37:53 +00:00
|
|
|
:name (concat user-login-name "@" (system-name))
|
lisp/frameset.el: Convert `frameset' to vector and add new slots.
(frameset): Use type vector, not list (incompatible change).
Do not declare a new constructor, use the default one.
Upgrade suggested properties `app', `name' and `desc' to slots `app',
`name' and `description', respectively, and add read-only slot `timestamp'.
Doc fixes.
(frameset-copy, frameset-persistent-filter-alist)
(frameset-filter-alist, frameset-switch-to-gui-p)
(frameset-switch-to-tty-p, frameset-filter-tty-to-GUI)
(frameset-filter-sanitize-color, frameset-filter-minibuffer)
(frameset-filter-iconified, frameset-keep-original-display-p):
Doc fixes.
(frameset-filter-shelve-param, frameset-filter-unshelve-param):
Rename from frameset-filter-(save|restore)-param. All callers changed.
Doc fix.
(frameset-p): Adapt to change to vector and be more thorough.
Change arg name to OBJECT. Doc fix.
(frameset-prop): Rename arg PROP to PROPERTY. Doc fix.
(frameset-session-filter-alist): Rename from frameset-live-filter-alist.
All callers changed.
(frameset-frame-with-id): Rename from frameset-locate-frame-id.
All callers changed.
(frameset--record-minibuffer-relationships): Rename from
frameset--process-minibuffer-frames. All callers changed.
(frameset-save): Add new keyword arguments APP, NAME and DESCRIPTION.
Use new default constructor (again). Doc fix.
(frameset--find-frame-if): Rename from `frameset--find-frame.
All callers changed.
(frameset--reuse-frame): Rename arg FRAME-CFG to PARAMETERS.
(frameset--initial-params): Rename arg FRAME-CFG to PARAMETERS.
Doc fix.
(frameset--restore-frame): Rename args FRAME-CFG and WINDOW-CFG to
PARAMETERS and WINDOW-STATE, respectively.
(frameset-restore): Add new keyword argument PREDICATE.
Reset frameset--target-display to nil. Doc fix.
lisp/desktop.el (desktop-save-frameset): Use new frameset-save args.
Use lexical-binding.
2013-08-07 22:54:08 +00:00
|
|
|
:predicate #'desktop--check-dont-save))))
|
2013-06-27 09:08:14 +00:00
|
|
|
|
2006-06-23 21:42:33 +00:00
|
|
|
;;;###autoload
|
2016-01-18 13:32:22 +00:00
|
|
|
(defun desktop-save (dirname &optional release only-if-changed version)
|
2020-05-01 19:59:27 +00:00
|
|
|
"Save the state of Emacs in a desktop file in directory DIRNAME.
|
|
|
|
Optional argument RELEASE non-nil says we're done with this
|
|
|
|
desktop, in which case this function releases the lock of the
|
|
|
|
desktop file in DIRNAME.
|
|
|
|
If ONLY-IF-CHANGED is non-nil, compare the current desktop
|
|
|
|
information to that in the desktop file, and if the desktop
|
|
|
|
information has not changed since it was last saved, then do
|
|
|
|
not rewrite the file.
|
|
|
|
|
|
|
|
To restore the desktop, use `desktop-read'.
|
2016-01-18 13:32:22 +00:00
|
|
|
|
|
|
|
This function can save the desktop in either format version
|
|
|
|
208 (which only Emacs 25.1 and later can read) or version
|
|
|
|
206 (which is readable by any Emacs from version 22.1 onwards).
|
|
|
|
By default, it will use the same format the desktop file had when
|
|
|
|
it was last saved, or version 208 when writing a fresh desktop
|
|
|
|
file.
|
|
|
|
|
|
|
|
To upgrade a version 206 file to version 208, call this command
|
2020-05-01 19:59:27 +00:00
|
|
|
explicitly with a prefix argument: \\[universal-argument] \\[desktop-save].
|
2020-08-13 23:46:12 +00:00
|
|
|
If you are upgrading from Emacs 24 or older, we recommend to do
|
2020-05-01 19:59:27 +00:00
|
|
|
this once you decide you no longer need compatibility with versions
|
|
|
|
of Emacs before 25.1.
|
|
|
|
|
|
|
|
To downgrade a version 208 file to version 206, use a double prefix
|
|
|
|
argument: \\[universal-argument] \\[universal-argument] \\[desktop-save].
|
|
|
|
|
|
|
|
Emacs will ask for confirmation when you upgrade or downgrade your
|
|
|
|
desktop file.
|
|
|
|
|
|
|
|
In a non-interactive call, VERSION can be given as an integer, either
|
|
|
|
206 or 208, to specify the format version in which to save the file,
|
|
|
|
no questions asked."
|
2013-10-10 01:03:11 +00:00
|
|
|
(interactive (list
|
|
|
|
;; Or should we just use (car desktop-path)?
|
|
|
|
(let ((default (if (member "." desktop-path)
|
|
|
|
default-directory
|
|
|
|
user-emacs-directory)))
|
|
|
|
(read-directory-name "Directory to save desktop file in: "
|
2016-01-18 13:32:22 +00:00
|
|
|
default default t))
|
|
|
|
nil
|
|
|
|
nil
|
|
|
|
current-prefix-arg))
|
2007-06-12 09:11:31 +00:00
|
|
|
(setq desktop-dirname (file-name-as-directory (expand-file-name dirname)))
|
1993-06-01 20:09:25 +00:00
|
|
|
(save-excursion
|
2007-06-12 09:11:31 +00:00
|
|
|
(let ((eager desktop-restore-eager)
|
file-attributes cleanup
Mostly, this replaces magic-number calls like (nth 4 A) with
more-informative calls like (file-attribute-access-time A).
It also fixes some documentation and minor timestamp coding
issues that I noticed while looking into this.
* doc/lispref/files.texi (File Attributes):
* lisp/files.el (file-attribute-size)
(file-attribute-inode-number, file-attribute-device-number):
* src/dired.c (Fdirectory_files_and_attributes)
(Ffile_attributes):
Mention which attributes must be integers, or nonnegative integers,
as opposed to merely being numbers. Remove no-longer-correct
talk about representing large integers as conses of integers.
* doc/lispref/files.texi (Magic File Names):
* doc/misc/gnus.texi (Low-level interface to the spam-stat dictionary):
* lisp/autorevert.el (auto-revert-find-file-function)
(auto-revert-tail-mode, auto-revert-handler):
* lisp/auth-source.el (auth-source-netrc-parse):
* lisp/cedet/ede/files.el (ede--inode-for-dir):
* lisp/cedet/semantic/db-file.el (object-write):
* lisp/cedet/semantic/db-mode.el (semanticdb-kill-hook):
* lisp/cedet/semantic/db.el (semanticdb-needs-refresh-p)
(semanticdb-synchronize):
* lisp/cedet/srecode/table.el (srecode-mode-table-new):
* lisp/desktop.el (desktop-save, desktop-read):
* lisp/dired-aux.el (dired-file-set-difference)
(dired-do-chxxx, dired-do-chmod, dired-copy-file-recursive)
(dired-create-files):
* lisp/dired.el (dired-directory-changed-p, dired-readin):
* lisp/dos-w32.el (w32-direct-print-region-helper):
* lisp/emacs-lisp/autoload.el (autoload-generate-file-autoloads)
(autoload-find-destination, update-directory-autoloads):
* lisp/emacs-lisp/shadow.el (load-path-shadows-same-file-or-nonexistent):
* lisp/epg.el (epg--start, epg-wait-for-completion):
* lisp/eshell/em-ls.el (eshell-ls-filetype-p)
(eshell-ls-applicable, eshell-ls-size-string)
(eshell-ls-file, eshell-ls-dir, eshell-ls-files)
(eshell-ls-entries):
* lisp/eshell/em-pred.el (eshell-predicate-alist)
(eshell-pred-file-type, eshell-pred-file-links)
(eshell-pred-file-size):
* lisp/eshell/em-unix.el (eshell-shuffle-files, eshell/cat)
(eshell-du-sum-directory, eshell/du):
* lisp/eshell/esh-util.el (eshell-read-passwd)
(eshell-read-hosts):
* lisp/files.el (remote-file-name-inhibit-cache)
(find-file-noselect, insert-file-1, dir-locals-find-file)
(dir-locals-read-from-dir, backup-buffer)
(file-ownership-preserved-p, copy-directory)
(read-file-modes):
* lisp/find-lisp.el (find-lisp-format):
* lisp/gnus/gnus-agent.el (gnus-agent-unfetch-articles)
(gnus-agent-read-agentview, gnus-agent-expire-group-1)
(gnus-agent-request-article, gnus-agent-regenerate-group)
(gnus-agent-update-files-total-fetched-for)
(gnus-agent-update-view-total-fetched-for):
* lisp/gnus/gnus-cache.el (gnus-cache-read-active)
(gnus-cache-update-file-total-fetched-for)
(gnus-cache-update-overview-total-fetched-for):
* lisp/gnus/gnus-cloud.el (gnus-cloud-file-new-p):
* lisp/gnus/gnus-score.el (gnus-score-score-files):
* lisp/gnus/gnus-start.el (gnus-save-newsrc-file)
(gnus-master-read-slave-newsrc):
* lisp/gnus/gnus-sum.el (gnus-summary-import-article):
* lisp/gnus/gnus-util.el (gnus-file-newer-than)
(gnus-cache-file-contents):
* lisp/gnus/mail-source.el (mail-source-delete-old-incoming)
(mail-source-callback, mail-source-movemail):
* lisp/gnus/nneething.el (nneething-create-mapping)
(nneething-make-head):
* lisp/gnus/nnfolder.el (nnfolder-read-folder):
* lisp/gnus/nnheader.el (nnheader-file-size)
(nnheader-insert-nov-file):
* lisp/gnus/nnmail.el (nnmail-activate):
* lisp/gnus/nnmaildir.el (nnmaildir--group-maxnum)
(nnmaildir--new-number, nnmaildir--update-nov)
(nnmaildir--scan, nnmaildir-request-scan)
(nnmaildir-request-update-info)
(nnmaildir-request-expire-articles):
* lisp/gnus/nnmh.el (nnmh-request-list-1)
(nnmh-request-expire-articles, nnmh-update-gnus-unreads):
* lisp/gnus/nnml.el (nnml-request-expire-articles):
* lisp/gnus/spam-stat.el (spam-stat-save, spam-stat-load)
(spam-stat-process-directory, spam-stat-test-directory):
* lisp/ido.el (ido-directory-too-big-p)
(ido-file-name-all-completions):
* lisp/image-dired.el (image-dired-get-thumbnail-image)
(image-dired-create-thumb-1):
* lisp/info.el (info-insert-file-contents):
* lisp/ls-lisp.el (ls-lisp-insert-directory)
(ls-lisp-handle-switches, ls-lisp-classify-file)
(ls-lisp-format):
* lisp/mail/blessmail.el:
* lisp/mail/feedmail.el (feedmail-default-date-generator)
(feedmail-default-message-id-generator):
* lisp/mail/mailabbrev.el (mail-abbrevs-sync-aliases)
(mail-abbrevs-setup):
* lisp/mail/mspools.el (mspools-size-folder):
* lisp/mail/rmail.el (rmail-insert-inbox-text):
* lisp/mail/sendmail.el (sendmail-sync-aliases):
* lisp/mh-e/mh-alias.el (mh-alias-tstamp):
* lisp/net/ange-ftp.el (ange-ftp-parse-netrc)
(ange-ftp-write-region, ange-ftp-file-newer-than-file-p)
(ange-ftp-cf1):
* lisp/net/eudcb-mab.el (eudc-mab-query-internal):
* lisp/net/eww.el (eww-read-bookmarks):
* lisp/net/netrc.el (netrc-parse):
* lisp/net/newst-backend.el (newsticker--image-get):
* lisp/nxml/rng-loc.el (rng-get-parsed-schema-locating-file):
* lisp/obsolete/fast-lock.el (fast-lock-save-cache):
* lisp/obsolete/vc-arch.el (vc-arch-state)
(vc-arch-diff3-rej-p):
* lisp/org/ob-eval.el (org-babel--shell-command-on-region):
* lisp/org/org-attach.el (org-attach-commit):
* lisp/org/org-macro.el (org-macro-initialize-templates):
* lisp/org/org.el (org-babel-load-file)
(org-file-newer-than-p):
* lisp/org/ox-html.el (org-html-format-spec):
* lisp/org/ox-publish.el (org-publish-find-date)
(org-publish-cache-ctime-of-src):
* lisp/pcmpl-gnu.el (pcomplete/tar):
* lisp/pcmpl-rpm.el (pcmpl-rpm-packages):
* lisp/play/cookie1.el (cookie-snarf):
* lisp/progmodes/cmacexp.el (c-macro-expansion):
* lisp/ps-bdf.el (bdf-file-mod-time):
* lisp/server.el (server-ensure-safe-dir):
* lisp/simple.el (shell-command-on-region):
* lisp/speedbar.el (speedbar-item-info-file-helper)
(speedbar-check-obj-this-line):
* lisp/thumbs.el (thumbs-cleanup-thumbsdir):
* lisp/time.el (display-time-mail-check-directory)
(display-time-file-nonempty-p):
* lisp/url/url-cache.el (url-is-cached):
* lisp/url/url-file.el (url-file-asynch-callback):
* lisp/vc/diff-mode.el (diff-delete-if-empty):
* lisp/vc/pcvs-info.el (cvs-fileinfo-from-entries):
* lisp/vc/vc-bzr.el (vc-bzr-state-heuristic):
* lisp/vc/vc-cvs.el (vc-cvs-checkout-model)
(vc-cvs-state-heuristic, vc-cvs-merge-news)
(vc-cvs-retrieve-tag, vc-cvs-parse-status, vc-cvs-parse-entry):
* lisp/vc/vc-hg.el (vc-hg--slurp-hgignore-1)
(vc-hg--ignore-patterns-valid-p)
(vc-hg--cached-dirstate-search, vc-hg-state-fast):
* lisp/vc/vc-hooks.el (vc-after-save):
* lisp/vc/vc-rcs.el (vc-rcs-workfile-is-newer):
* lisp/vc/vc-svn.el (vc-svn-merge-news, vc-svn-parse-status):
* lisp/vc/vc.el (vc-checkout, vc-checkin, vc-revert-file):
* lisp/xdg.el (xdg-mime-apps):
Prefer (file-attribute-size A) to (nth 7 A), and similarly
for other file attributes accessors.
* doc/lispref/files.texi (File Attributes):
* doc/lispref/intro.texi (Version Info):
* doc/lispref/os.texi (Idle Timers):
* lisp/erc/erc.el (erc-string-to-emacs-time):
* lisp/files.el (file-attribute-access-time)
(file-attribute-modification-time)
(file-attribute-status-change-time):
* lisp/net/tramp-compat.el:
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-size):
* src/buffer.c (syms_of_buffer):
* src/editfns.c (Fget_internal_run_time):
* src/fileio.c (Fvisited_file_modtime)
(Fset_visited_file_modtime):
* src/keyboard.c (Fcurrent_idle_time):
* src/process.c (Fprocess_attributes):
Defer implementation details about timestamp format to the
section that talks about timestamp format, to make it easier
to change the documentation later if timestamp formats are
extended.
* lisp/gnus/gnus-util.el (gnus-file-newer-than):
* lisp/speedbar.el (speedbar-check-obj-this-line):
* lisp/vc/vc-rcs.el (vc-rcs-workfile-is-newer):
Prefer time-less-p to doing it by hand.
* lisp/ls-lisp.el (ls-lisp-format): Inode numbers are no longer conses.
* lisp/vc/vc-bzr.el (vc-bzr-state-heuristic):
Use eql, not eq, to compare integers that might be bignums.
* lisp/org/ox-publish.el (org-publish-cache-ctime-of-src):
Prefer float-time to doing time arithmetic by hand.
2018-09-24 01:30:46 +00:00
|
|
|
(new-modtime (file-attribute-modification-time
|
|
|
|
(file-attributes (desktop-full-file-name)))))
|
2007-06-12 09:11:31 +00:00
|
|
|
(when
|
|
|
|
(or (not new-modtime) ; nothing to overwrite
|
|
|
|
(equal desktop-file-modtime new-modtime)
|
|
|
|
(yes-or-no-p (if desktop-file-modtime
|
2017-10-22 08:04:36 +00:00
|
|
|
(if (time-less-p desktop-file-modtime
|
|
|
|
new-modtime)
|
2007-06-12 09:11:31 +00:00
|
|
|
"Desktop file is more recent than the one loaded. Save anyway? "
|
|
|
|
"Desktop file isn't the one loaded. Overwrite it? ")
|
|
|
|
"Current desktop was not loaded from a file. Overwrite this desktop file? "))
|
|
|
|
(unless release (error "Desktop file conflict")))
|
|
|
|
|
|
|
|
;; If we're done with it, release the lock.
|
|
|
|
;; Otherwise, claim it if it's unclaimed or if we created it.
|
|
|
|
(if release
|
|
|
|
(desktop-release-lock)
|
|
|
|
(unless (and new-modtime (desktop-owner)) (desktop-claim-lock)))
|
|
|
|
|
2016-01-18 13:32:22 +00:00
|
|
|
;; What format are we going to write the file in?
|
|
|
|
(setq desktop-io-file-version
|
|
|
|
(cond
|
|
|
|
((equal version '(4))
|
|
|
|
(if (or (eq desktop-io-file-version 208)
|
|
|
|
(yes-or-no-p "Save desktop file in format 208 \
|
|
|
|
\(Readable by Emacs 25.1 and later only)? "))
|
|
|
|
208
|
|
|
|
(or desktop-io-file-version desktop-native-file-version)))
|
|
|
|
((equal version '(16))
|
|
|
|
(if (or (eq desktop-io-file-version 206)
|
|
|
|
(yes-or-no-p "Save desktop file in format 206 \
|
|
|
|
\(Readable by all Emacs versions since 22.1)? "))
|
|
|
|
206
|
|
|
|
(or desktop-io-file-version desktop-native-file-version)))
|
|
|
|
((memq version '(206 208))
|
|
|
|
version)
|
|
|
|
((null desktop-io-file-version) ; As yet, no desktop file exists.
|
|
|
|
desktop-native-file-version)
|
|
|
|
(t
|
|
|
|
desktop-io-file-version)))
|
|
|
|
|
2007-06-12 09:11:31 +00:00
|
|
|
(with-temp-buffer
|
|
|
|
(insert
|
2018-03-14 16:14:01 +00:00
|
|
|
";; -*- mode: emacs-lisp; lexical-binding:t; coding: utf-8-emacs; -*-\n"
|
2007-06-12 09:11:31 +00:00
|
|
|
desktop-header
|
|
|
|
";; Created " (current-time-string) "\n"
|
2016-01-18 13:32:22 +00:00
|
|
|
";; Desktop file format version " (format "%d" desktop-io-file-version) "\n"
|
2007-06-12 09:11:31 +00:00
|
|
|
";; Emacs version " emacs-version "\n")
|
|
|
|
(save-excursion (run-hooks 'desktop-save-hook))
|
|
|
|
(goto-char (point-max))
|
|
|
|
(insert "\n;; Global section:\n")
|
2013-06-27 09:08:14 +00:00
|
|
|
;; Called here because we save the window/frame state as a global
|
|
|
|
;; variable for compatibility with previous Emacsen.
|
lisp/desktop.el: Move code related to saving frames to frameset.el.
Require frameset.
(desktop-restore-frames): Doc fix.
(desktop-restore-reuses-frames): Rename from
desktop-restoring-reuses-frames.
(desktop-saved-frameset): Rename from desktop-saved-frame-states.
(desktop-clear): Clear frames too.
(desktop-filter-parameters-alist): Set from frameset-filter-alist.
(desktop--filter-tty*, desktop-save, desktop-read):
Use frameset functions.
(desktop-before-saving-frames-functions, desktop--filter-*-color)
(desktop--filter-minibuffer, desktop--filter-restore-desktop-parm)
(desktop--filter-save-desktop-parm, desktop--filter-iconified-position)
(desktop-restore-in-original-display-p, desktop--filter-frame-parms)
(desktop--process-minibuffer-frames, desktop-save-frames)
(desktop--reuse-list, desktop--compute-pos, desktop--move-onscreen)
(desktop--find-frame, desktop--select-frame, desktop--make-frame)
(desktop--sort-states, desktop-restoring-frames-p)
(desktop-restore-frames): Remove. Most code moved to frameset.el.
(desktop-restoring-frameset-p, desktop-restore-frameset)
(desktop--check-dont-save, desktop-save-frameset): New functions.
(desktop--app-id): New constant.
(desktop-first-buffer, desktop-buffer-ok-count)
(desktop-buffer-fail-count): Move before first use.
lisp/frameset.el: New file.
2013-08-02 04:33:58 +00:00
|
|
|
(desktop-save-frameset)
|
|
|
|
(unless (memq 'desktop-saved-frameset desktop-globals-to-save)
|
|
|
|
(desktop-outvar 'desktop-saved-frameset))
|
2018-03-14 16:14:01 +00:00
|
|
|
(mapc #'desktop-outvar desktop-globals-to-save)
|
lisp/desktop.el: Move code related to saving frames to frameset.el.
Require frameset.
(desktop-restore-frames): Doc fix.
(desktop-restore-reuses-frames): Rename from
desktop-restoring-reuses-frames.
(desktop-saved-frameset): Rename from desktop-saved-frame-states.
(desktop-clear): Clear frames too.
(desktop-filter-parameters-alist): Set from frameset-filter-alist.
(desktop--filter-tty*, desktop-save, desktop-read):
Use frameset functions.
(desktop-before-saving-frames-functions, desktop--filter-*-color)
(desktop--filter-minibuffer, desktop--filter-restore-desktop-parm)
(desktop--filter-save-desktop-parm, desktop--filter-iconified-position)
(desktop-restore-in-original-display-p, desktop--filter-frame-parms)
(desktop--process-minibuffer-frames, desktop-save-frames)
(desktop--reuse-list, desktop--compute-pos, desktop--move-onscreen)
(desktop--find-frame, desktop--select-frame, desktop--make-frame)
(desktop--sort-states, desktop-restoring-frames-p)
(desktop-restore-frames): Remove. Most code moved to frameset.el.
(desktop-restoring-frameset-p, desktop-restore-frameset)
(desktop--check-dont-save, desktop-save-frameset): New functions.
(desktop--app-id): New constant.
(desktop-first-buffer, desktop-buffer-ok-count)
(desktop-buffer-fail-count): Move before first use.
lisp/frameset.el: New file.
2013-08-02 04:33:58 +00:00
|
|
|
(setq desktop-saved-frameset nil) ; after saving desktop-globals-to-save
|
2007-06-12 09:11:31 +00:00
|
|
|
(when (memq 'kill-ring desktop-globals-to-save)
|
|
|
|
(insert
|
|
|
|
"(setq kill-ring-yank-pointer (nthcdr "
|
|
|
|
(int-to-string (- (length kill-ring) (length kill-ring-yank-pointer)))
|
|
|
|
" kill-ring))\n"))
|
|
|
|
|
|
|
|
(insert "\n;; Buffer section -- buffers listed in same order as in buffer list:\n")
|
2018-03-14 16:14:01 +00:00
|
|
|
(dolist (l (mapcar #'desktop-buffer-info (buffer-list)))
|
2008-02-14 14:37:00 +00:00
|
|
|
(let ((base (pop l)))
|
2018-03-14 16:14:01 +00:00
|
|
|
(when (apply #'desktop-save-buffer-p l)
|
2008-02-14 14:37:00 +00:00
|
|
|
(insert "("
|
|
|
|
(if (or (not (integerp eager))
|
|
|
|
(if (zerop eager)
|
|
|
|
nil
|
|
|
|
(setq eager (1- eager))))
|
|
|
|
"desktop-create-buffer"
|
|
|
|
"desktop-append-buffer-args")
|
|
|
|
" "
|
2016-01-18 13:32:22 +00:00
|
|
|
(format "%d" desktop-io-file-version))
|
2008-02-29 03:03:57 +00:00
|
|
|
;; If there's a non-empty base name, we save it instead of the buffer name
|
|
|
|
(when (and base (not (string= base "")))
|
|
|
|
(setcar (nthcdr 1 l) base))
|
2008-02-14 14:37:00 +00:00
|
|
|
(dolist (e l)
|
|
|
|
(insert "\n " (desktop-value-to-string e)))
|
|
|
|
(insert ")\n\n"))))
|
2007-06-12 09:11:31 +00:00
|
|
|
|
2007-07-12 22:40:00 +00:00
|
|
|
(setq default-directory desktop-dirname)
|
2013-12-16 21:48:51 +00:00
|
|
|
;; When auto-saving, avoid writing if nothing has changed since the last write.
|
2014-07-02 23:45:12 +00:00
|
|
|
(let* ((beg (and only-if-changed
|
2013-12-16 21:48:51 +00:00
|
|
|
(save-excursion
|
|
|
|
(goto-char (point-min))
|
|
|
|
;; Don't check the header with changing timestamp
|
|
|
|
(and (search-forward "Global section" nil t)
|
|
|
|
;; Also skip the timestamp in desktop-saved-frameset
|
|
|
|
;; if it's saved in the first non-header line
|
|
|
|
(search-forward "desktop-saved-frameset"
|
|
|
|
(line-beginning-position 3) t)
|
|
|
|
;; This is saved after the timestamp
|
|
|
|
(search-forward (format "%S" desktop--app-id) nil t))
|
|
|
|
(point))))
|
2018-03-14 16:14:01 +00:00
|
|
|
(checksum (and beg (md5 (current-buffer) beg (point-max) 'utf-8-emacs))))
|
2013-12-16 21:48:51 +00:00
|
|
|
(unless (and checksum (equal checksum desktop-file-checksum))
|
2018-03-14 16:14:01 +00:00
|
|
|
(let ((coding-system-for-write 'utf-8-emacs))
|
2013-04-27 20:55:00 +00:00
|
|
|
(write-region (point-min) (point-max) (desktop-full-file-name) nil 'nomessage))
|
|
|
|
(setq desktop-file-checksum checksum)
|
|
|
|
;; We remember when it was modified (which is presumably just now).
|
file-attributes cleanup
Mostly, this replaces magic-number calls like (nth 4 A) with
more-informative calls like (file-attribute-access-time A).
It also fixes some documentation and minor timestamp coding
issues that I noticed while looking into this.
* doc/lispref/files.texi (File Attributes):
* lisp/files.el (file-attribute-size)
(file-attribute-inode-number, file-attribute-device-number):
* src/dired.c (Fdirectory_files_and_attributes)
(Ffile_attributes):
Mention which attributes must be integers, or nonnegative integers,
as opposed to merely being numbers. Remove no-longer-correct
talk about representing large integers as conses of integers.
* doc/lispref/files.texi (Magic File Names):
* doc/misc/gnus.texi (Low-level interface to the spam-stat dictionary):
* lisp/autorevert.el (auto-revert-find-file-function)
(auto-revert-tail-mode, auto-revert-handler):
* lisp/auth-source.el (auth-source-netrc-parse):
* lisp/cedet/ede/files.el (ede--inode-for-dir):
* lisp/cedet/semantic/db-file.el (object-write):
* lisp/cedet/semantic/db-mode.el (semanticdb-kill-hook):
* lisp/cedet/semantic/db.el (semanticdb-needs-refresh-p)
(semanticdb-synchronize):
* lisp/cedet/srecode/table.el (srecode-mode-table-new):
* lisp/desktop.el (desktop-save, desktop-read):
* lisp/dired-aux.el (dired-file-set-difference)
(dired-do-chxxx, dired-do-chmod, dired-copy-file-recursive)
(dired-create-files):
* lisp/dired.el (dired-directory-changed-p, dired-readin):
* lisp/dos-w32.el (w32-direct-print-region-helper):
* lisp/emacs-lisp/autoload.el (autoload-generate-file-autoloads)
(autoload-find-destination, update-directory-autoloads):
* lisp/emacs-lisp/shadow.el (load-path-shadows-same-file-or-nonexistent):
* lisp/epg.el (epg--start, epg-wait-for-completion):
* lisp/eshell/em-ls.el (eshell-ls-filetype-p)
(eshell-ls-applicable, eshell-ls-size-string)
(eshell-ls-file, eshell-ls-dir, eshell-ls-files)
(eshell-ls-entries):
* lisp/eshell/em-pred.el (eshell-predicate-alist)
(eshell-pred-file-type, eshell-pred-file-links)
(eshell-pred-file-size):
* lisp/eshell/em-unix.el (eshell-shuffle-files, eshell/cat)
(eshell-du-sum-directory, eshell/du):
* lisp/eshell/esh-util.el (eshell-read-passwd)
(eshell-read-hosts):
* lisp/files.el (remote-file-name-inhibit-cache)
(find-file-noselect, insert-file-1, dir-locals-find-file)
(dir-locals-read-from-dir, backup-buffer)
(file-ownership-preserved-p, copy-directory)
(read-file-modes):
* lisp/find-lisp.el (find-lisp-format):
* lisp/gnus/gnus-agent.el (gnus-agent-unfetch-articles)
(gnus-agent-read-agentview, gnus-agent-expire-group-1)
(gnus-agent-request-article, gnus-agent-regenerate-group)
(gnus-agent-update-files-total-fetched-for)
(gnus-agent-update-view-total-fetched-for):
* lisp/gnus/gnus-cache.el (gnus-cache-read-active)
(gnus-cache-update-file-total-fetched-for)
(gnus-cache-update-overview-total-fetched-for):
* lisp/gnus/gnus-cloud.el (gnus-cloud-file-new-p):
* lisp/gnus/gnus-score.el (gnus-score-score-files):
* lisp/gnus/gnus-start.el (gnus-save-newsrc-file)
(gnus-master-read-slave-newsrc):
* lisp/gnus/gnus-sum.el (gnus-summary-import-article):
* lisp/gnus/gnus-util.el (gnus-file-newer-than)
(gnus-cache-file-contents):
* lisp/gnus/mail-source.el (mail-source-delete-old-incoming)
(mail-source-callback, mail-source-movemail):
* lisp/gnus/nneething.el (nneething-create-mapping)
(nneething-make-head):
* lisp/gnus/nnfolder.el (nnfolder-read-folder):
* lisp/gnus/nnheader.el (nnheader-file-size)
(nnheader-insert-nov-file):
* lisp/gnus/nnmail.el (nnmail-activate):
* lisp/gnus/nnmaildir.el (nnmaildir--group-maxnum)
(nnmaildir--new-number, nnmaildir--update-nov)
(nnmaildir--scan, nnmaildir-request-scan)
(nnmaildir-request-update-info)
(nnmaildir-request-expire-articles):
* lisp/gnus/nnmh.el (nnmh-request-list-1)
(nnmh-request-expire-articles, nnmh-update-gnus-unreads):
* lisp/gnus/nnml.el (nnml-request-expire-articles):
* lisp/gnus/spam-stat.el (spam-stat-save, spam-stat-load)
(spam-stat-process-directory, spam-stat-test-directory):
* lisp/ido.el (ido-directory-too-big-p)
(ido-file-name-all-completions):
* lisp/image-dired.el (image-dired-get-thumbnail-image)
(image-dired-create-thumb-1):
* lisp/info.el (info-insert-file-contents):
* lisp/ls-lisp.el (ls-lisp-insert-directory)
(ls-lisp-handle-switches, ls-lisp-classify-file)
(ls-lisp-format):
* lisp/mail/blessmail.el:
* lisp/mail/feedmail.el (feedmail-default-date-generator)
(feedmail-default-message-id-generator):
* lisp/mail/mailabbrev.el (mail-abbrevs-sync-aliases)
(mail-abbrevs-setup):
* lisp/mail/mspools.el (mspools-size-folder):
* lisp/mail/rmail.el (rmail-insert-inbox-text):
* lisp/mail/sendmail.el (sendmail-sync-aliases):
* lisp/mh-e/mh-alias.el (mh-alias-tstamp):
* lisp/net/ange-ftp.el (ange-ftp-parse-netrc)
(ange-ftp-write-region, ange-ftp-file-newer-than-file-p)
(ange-ftp-cf1):
* lisp/net/eudcb-mab.el (eudc-mab-query-internal):
* lisp/net/eww.el (eww-read-bookmarks):
* lisp/net/netrc.el (netrc-parse):
* lisp/net/newst-backend.el (newsticker--image-get):
* lisp/nxml/rng-loc.el (rng-get-parsed-schema-locating-file):
* lisp/obsolete/fast-lock.el (fast-lock-save-cache):
* lisp/obsolete/vc-arch.el (vc-arch-state)
(vc-arch-diff3-rej-p):
* lisp/org/ob-eval.el (org-babel--shell-command-on-region):
* lisp/org/org-attach.el (org-attach-commit):
* lisp/org/org-macro.el (org-macro-initialize-templates):
* lisp/org/org.el (org-babel-load-file)
(org-file-newer-than-p):
* lisp/org/ox-html.el (org-html-format-spec):
* lisp/org/ox-publish.el (org-publish-find-date)
(org-publish-cache-ctime-of-src):
* lisp/pcmpl-gnu.el (pcomplete/tar):
* lisp/pcmpl-rpm.el (pcmpl-rpm-packages):
* lisp/play/cookie1.el (cookie-snarf):
* lisp/progmodes/cmacexp.el (c-macro-expansion):
* lisp/ps-bdf.el (bdf-file-mod-time):
* lisp/server.el (server-ensure-safe-dir):
* lisp/simple.el (shell-command-on-region):
* lisp/speedbar.el (speedbar-item-info-file-helper)
(speedbar-check-obj-this-line):
* lisp/thumbs.el (thumbs-cleanup-thumbsdir):
* lisp/time.el (display-time-mail-check-directory)
(display-time-file-nonempty-p):
* lisp/url/url-cache.el (url-is-cached):
* lisp/url/url-file.el (url-file-asynch-callback):
* lisp/vc/diff-mode.el (diff-delete-if-empty):
* lisp/vc/pcvs-info.el (cvs-fileinfo-from-entries):
* lisp/vc/vc-bzr.el (vc-bzr-state-heuristic):
* lisp/vc/vc-cvs.el (vc-cvs-checkout-model)
(vc-cvs-state-heuristic, vc-cvs-merge-news)
(vc-cvs-retrieve-tag, vc-cvs-parse-status, vc-cvs-parse-entry):
* lisp/vc/vc-hg.el (vc-hg--slurp-hgignore-1)
(vc-hg--ignore-patterns-valid-p)
(vc-hg--cached-dirstate-search, vc-hg-state-fast):
* lisp/vc/vc-hooks.el (vc-after-save):
* lisp/vc/vc-rcs.el (vc-rcs-workfile-is-newer):
* lisp/vc/vc-svn.el (vc-svn-merge-news, vc-svn-parse-status):
* lisp/vc/vc.el (vc-checkout, vc-checkin, vc-revert-file):
* lisp/xdg.el (xdg-mime-apps):
Prefer (file-attribute-size A) to (nth 7 A), and similarly
for other file attributes accessors.
* doc/lispref/files.texi (File Attributes):
* doc/lispref/intro.texi (Version Info):
* doc/lispref/os.texi (Idle Timers):
* lisp/erc/erc.el (erc-string-to-emacs-time):
* lisp/files.el (file-attribute-access-time)
(file-attribute-modification-time)
(file-attribute-status-change-time):
* lisp/net/tramp-compat.el:
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-size):
* src/buffer.c (syms_of_buffer):
* src/editfns.c (Fget_internal_run_time):
* src/fileio.c (Fvisited_file_modtime)
(Fset_visited_file_modtime):
* src/keyboard.c (Fcurrent_idle_time):
* src/process.c (Fprocess_attributes):
Defer implementation details about timestamp format to the
section that talks about timestamp format, to make it easier
to change the documentation later if timestamp formats are
extended.
* lisp/gnus/gnus-util.el (gnus-file-newer-than):
* lisp/speedbar.el (speedbar-check-obj-this-line):
* lisp/vc/vc-rcs.el (vc-rcs-workfile-is-newer):
Prefer time-less-p to doing it by hand.
* lisp/ls-lisp.el (ls-lisp-format): Inode numbers are no longer conses.
* lisp/vc/vc-bzr.el (vc-bzr-state-heuristic):
Use eql, not eq, to compare integers that might be bignums.
* lisp/org/ox-publish.el (org-publish-cache-ctime-of-src):
Prefer float-time to doing time arithmetic by hand.
2018-09-24 01:30:46 +00:00
|
|
|
(setq desktop-file-modtime (file-attribute-modification-time
|
|
|
|
(file-attributes
|
|
|
|
(desktop-full-file-name)))))))))))
|
2003-04-09 01:37:56 +00:00
|
|
|
|
1993-10-07 16:50:26 +00:00
|
|
|
;; ----------------------------------------------------------------------------
|
2006-06-23 21:42:33 +00:00
|
|
|
;;;###autoload
|
1993-06-01 20:09:25 +00:00
|
|
|
(defun desktop-remove ()
|
2004-04-16 12:51:06 +00:00
|
|
|
"Delete desktop file in `desktop-dirname'.
|
|
|
|
This function also sets `desktop-dirname' to nil."
|
1993-06-01 20:09:25 +00:00
|
|
|
(interactive)
|
2004-04-16 12:51:06 +00:00
|
|
|
(when desktop-dirname
|
2006-06-23 21:42:33 +00:00
|
|
|
(let ((filename (desktop-full-file-name)))
|
2004-04-16 12:51:06 +00:00
|
|
|
(setq desktop-dirname nil)
|
|
|
|
(when (file-exists-p filename)
|
2003-06-03 23:35:20 +00:00
|
|
|
(delete-file filename)))))
|
2004-04-16 12:51:06 +00:00
|
|
|
|
2005-01-07 20:18:59 +00:00
|
|
|
(defvar desktop-buffer-args-list nil
|
|
|
|
"List of args for `desktop-create-buffer'.")
|
|
|
|
|
|
|
|
(defvar desktop-lazy-timer nil)
|
|
|
|
|
1993-10-07 16:50:26 +00:00
|
|
|
;; ----------------------------------------------------------------------------
|
lisp/desktop.el: Move code related to saving frames to frameset.el.
Require frameset.
(desktop-restore-frames): Doc fix.
(desktop-restore-reuses-frames): Rename from
desktop-restoring-reuses-frames.
(desktop-saved-frameset): Rename from desktop-saved-frame-states.
(desktop-clear): Clear frames too.
(desktop-filter-parameters-alist): Set from frameset-filter-alist.
(desktop--filter-tty*, desktop-save, desktop-read):
Use frameset functions.
(desktop-before-saving-frames-functions, desktop--filter-*-color)
(desktop--filter-minibuffer, desktop--filter-restore-desktop-parm)
(desktop--filter-save-desktop-parm, desktop--filter-iconified-position)
(desktop-restore-in-original-display-p, desktop--filter-frame-parms)
(desktop--process-minibuffer-frames, desktop-save-frames)
(desktop--reuse-list, desktop--compute-pos, desktop--move-onscreen)
(desktop--find-frame, desktop--select-frame, desktop--make-frame)
(desktop--sort-states, desktop-restoring-frames-p)
(desktop-restore-frames): Remove. Most code moved to frameset.el.
(desktop-restoring-frameset-p, desktop-restore-frameset)
(desktop--check-dont-save, desktop-save-frameset): New functions.
(desktop--app-id): New constant.
(desktop-first-buffer, desktop-buffer-ok-count)
(desktop-buffer-fail-count): Move before first use.
lisp/frameset.el: New file.
2013-08-02 04:33:58 +00:00
|
|
|
(defun desktop-restoring-frameset-p ()
|
|
|
|
"True if calling `desktop-restore-frameset' will actually restore it."
|
2016-12-17 17:05:21 +00:00
|
|
|
(and desktop-restore-frames desktop-saved-frameset (display-graphic-p) t))
|
lisp/desktop.el: Move code related to saving frames to frameset.el.
Require frameset.
(desktop-restore-frames): Doc fix.
(desktop-restore-reuses-frames): Rename from
desktop-restoring-reuses-frames.
(desktop-saved-frameset): Rename from desktop-saved-frame-states.
(desktop-clear): Clear frames too.
(desktop-filter-parameters-alist): Set from frameset-filter-alist.
(desktop--filter-tty*, desktop-save, desktop-read):
Use frameset functions.
(desktop-before-saving-frames-functions, desktop--filter-*-color)
(desktop--filter-minibuffer, desktop--filter-restore-desktop-parm)
(desktop--filter-save-desktop-parm, desktop--filter-iconified-position)
(desktop-restore-in-original-display-p, desktop--filter-frame-parms)
(desktop--process-minibuffer-frames, desktop-save-frames)
(desktop--reuse-list, desktop--compute-pos, desktop--move-onscreen)
(desktop--find-frame, desktop--select-frame, desktop--make-frame)
(desktop--sort-states, desktop-restoring-frames-p)
(desktop-restore-frames): Remove. Most code moved to frameset.el.
(desktop-restoring-frameset-p, desktop-restore-frameset)
(desktop--check-dont-save, desktop-save-frameset): New functions.
(desktop--app-id): New constant.
(desktop-first-buffer, desktop-buffer-ok-count)
(desktop-buffer-fail-count): Move before first use.
lisp/frameset.el: New file.
2013-08-02 04:33:58 +00:00
|
|
|
|
|
|
|
(defun desktop-restore-frameset ()
|
|
|
|
"Restore the state of a set of frames.
|
|
|
|
This function depends on the value of `desktop-saved-frameset'
|
2013-07-21 17:45:12 +00:00
|
|
|
being set (usually, by reading it from the desktop)."
|
2016-12-17 17:05:21 +00:00
|
|
|
(when (desktop-restoring-frameset-p)
|
lisp/desktop.el: Move code related to saving frames to frameset.el.
Require frameset.
(desktop-restore-frames): Doc fix.
(desktop-restore-reuses-frames): Rename from
desktop-restoring-reuses-frames.
(desktop-saved-frameset): Rename from desktop-saved-frame-states.
(desktop-clear): Clear frames too.
(desktop-filter-parameters-alist): Set from frameset-filter-alist.
(desktop--filter-tty*, desktop-save, desktop-read):
Use frameset functions.
(desktop-before-saving-frames-functions, desktop--filter-*-color)
(desktop--filter-minibuffer, desktop--filter-restore-desktop-parm)
(desktop--filter-save-desktop-parm, desktop--filter-iconified-position)
(desktop-restore-in-original-display-p, desktop--filter-frame-parms)
(desktop--process-minibuffer-frames, desktop-save-frames)
(desktop--reuse-list, desktop--compute-pos, desktop--move-onscreen)
(desktop--find-frame, desktop--select-frame, desktop--make-frame)
(desktop--sort-states, desktop-restoring-frames-p)
(desktop-restore-frames): Remove. Most code moved to frameset.el.
(desktop-restoring-frameset-p, desktop-restore-frameset)
(desktop--check-dont-save, desktop-save-frameset): New functions.
(desktop--app-id): New constant.
(desktop-first-buffer, desktop-buffer-ok-count)
(desktop-buffer-fail-count): Move before first use.
lisp/frameset.el: New file.
2013-08-02 04:33:58 +00:00
|
|
|
(frameset-restore desktop-saved-frameset
|
2014-03-11 00:46:07 +00:00
|
|
|
:reuse-frames (eq desktop-restore-reuses-frames t)
|
|
|
|
:cleanup-frames (not (eq desktop-restore-reuses-frames 'keep))
|
lisp/desktop.el: Move code related to saving frames to frameset.el.
Require frameset.
(desktop-restore-frames): Doc fix.
(desktop-restore-reuses-frames): Rename from
desktop-restoring-reuses-frames.
(desktop-saved-frameset): Rename from desktop-saved-frame-states.
(desktop-clear): Clear frames too.
(desktop-filter-parameters-alist): Set from frameset-filter-alist.
(desktop--filter-tty*, desktop-save, desktop-read):
Use frameset functions.
(desktop-before-saving-frames-functions, desktop--filter-*-color)
(desktop--filter-minibuffer, desktop--filter-restore-desktop-parm)
(desktop--filter-save-desktop-parm, desktop--filter-iconified-position)
(desktop-restore-in-original-display-p, desktop--filter-frame-parms)
(desktop--process-minibuffer-frames, desktop-save-frames)
(desktop--reuse-list, desktop--compute-pos, desktop--move-onscreen)
(desktop--find-frame, desktop--select-frame, desktop--make-frame)
(desktop--sort-states, desktop-restoring-frames-p)
(desktop-restore-frames): Remove. Most code moved to frameset.el.
(desktop-restoring-frameset-p, desktop-restore-frameset)
(desktop--check-dont-save, desktop-save-frameset): New functions.
(desktop--app-id): New constant.
(desktop-first-buffer, desktop-buffer-ok-count)
(desktop-buffer-fail-count): Move before first use.
lisp/frameset.el: New file.
2013-08-02 04:33:58 +00:00
|
|
|
:force-display desktop-restore-in-current-display
|
|
|
|
:force-onscreen desktop-restore-forces-onscreen)))
|
|
|
|
|
|
|
|
;; Just to silence the byte compiler.
|
2013-08-16 05:15:51 +00:00
|
|
|
;; Dynamically bound in `desktop-read'.
|
lisp/desktop.el: Move code related to saving frames to frameset.el.
Require frameset.
(desktop-restore-frames): Doc fix.
(desktop-restore-reuses-frames): Rename from
desktop-restoring-reuses-frames.
(desktop-saved-frameset): Rename from desktop-saved-frame-states.
(desktop-clear): Clear frames too.
(desktop-filter-parameters-alist): Set from frameset-filter-alist.
(desktop--filter-tty*, desktop-save, desktop-read):
Use frameset functions.
(desktop-before-saving-frames-functions, desktop--filter-*-color)
(desktop--filter-minibuffer, desktop--filter-restore-desktop-parm)
(desktop--filter-save-desktop-parm, desktop--filter-iconified-position)
(desktop-restore-in-original-display-p, desktop--filter-frame-parms)
(desktop--process-minibuffer-frames, desktop-save-frames)
(desktop--reuse-list, desktop--compute-pos, desktop--move-onscreen)
(desktop--find-frame, desktop--select-frame, desktop--make-frame)
(desktop--sort-states, desktop-restoring-frames-p)
(desktop-restore-frames): Remove. Most code moved to frameset.el.
(desktop-restoring-frameset-p, desktop-restore-frameset)
(desktop--check-dont-save, desktop-save-frameset): New functions.
(desktop--app-id): New constant.
(desktop-first-buffer, desktop-buffer-ok-count)
(desktop-buffer-fail-count): Move before first use.
lisp/frameset.el: New file.
2013-08-02 04:33:58 +00:00
|
|
|
(defvar desktop-first-buffer)
|
|
|
|
(defvar desktop-buffer-ok-count)
|
|
|
|
(defvar desktop-buffer-fail-count)
|
2013-06-27 09:08:14 +00:00
|
|
|
|
1998-03-28 07:32:50 +00:00
|
|
|
;;;###autoload
|
2019-09-26 10:15:36 +00:00
|
|
|
(defun desktop-read (&optional dirname ask)
|
2004-04-16 12:51:06 +00:00
|
|
|
"Read and process the desktop file in directory DIRNAME.
|
|
|
|
Look for a desktop file in DIRNAME, or if DIRNAME is omitted, look in
|
|
|
|
directories listed in `desktop-path'. If a desktop file is found, it
|
2005-07-19 09:54:05 +00:00
|
|
|
is processed and `desktop-after-read-hook' is run. If no desktop file
|
2004-04-16 12:51:06 +00:00
|
|
|
is found, clear the desktop and run `desktop-no-desktop-file-hook'.
|
2019-09-26 10:15:36 +00:00
|
|
|
Interactively, with prefix arg \\[universal-argument], ask for DIRNAME.
|
2004-04-16 12:51:06 +00:00
|
|
|
This function is a no-op when Emacs is running in batch mode.
|
2019-09-26 10:15:36 +00:00
|
|
|
It returns t if a desktop file was loaded, nil otherwise.
|
|
|
|
\n(fn DIRNAME)"
|
|
|
|
(interactive "i\nP")
|
2020-12-07 17:53:55 +00:00
|
|
|
(if (or noninteractive
|
|
|
|
(and (desktop-owner)
|
|
|
|
(= (desktop-owner) (emacs-pid))))
|
|
|
|
(message "Not reloading the desktop%s"
|
|
|
|
(if noninteractive
|
|
|
|
""
|
|
|
|
"; already loaded"))
|
2004-04-16 12:51:06 +00:00
|
|
|
(setq desktop-dirname
|
2006-06-23 21:42:33 +00:00
|
|
|
(file-name-as-directory
|
|
|
|
(expand-file-name
|
|
|
|
(or
|
|
|
|
;; If DIRNAME is specified, use it.
|
|
|
|
(and (< 0 (length dirname)) dirname)
|
2019-09-26 10:15:36 +00:00
|
|
|
;; Else, with a prefix arg, ask for a directory name.
|
|
|
|
(and ask (read-directory-name "Directory for desktop file: " nil nil t))
|
2006-06-23 21:42:33 +00:00
|
|
|
;; Otherwise search desktop file in desktop-path.
|
|
|
|
(let ((dirs desktop-path))
|
|
|
|
(while (and dirs
|
|
|
|
(not (file-exists-p
|
|
|
|
(desktop-full-file-name (car dirs)))))
|
|
|
|
(setq dirs (cdr dirs)))
|
|
|
|
(and dirs (car dirs)))
|
|
|
|
;; If not found and `desktop-path' is non-nil, use its first element.
|
|
|
|
(and desktop-path (car desktop-path))
|
2012-06-21 07:25:56 +00:00
|
|
|
;; Default: .emacs.d.
|
|
|
|
user-emacs-directory))))
|
2006-06-23 21:42:33 +00:00
|
|
|
(if (file-exists-p (desktop-full-file-name))
|
2007-06-12 09:11:31 +00:00
|
|
|
;; Desktop file found, but is it already in use?
|
|
|
|
(let ((desktop-first-buffer nil)
|
|
|
|
(desktop-buffer-ok-count 0)
|
|
|
|
(desktop-buffer-fail-count 0)
|
|
|
|
(owner (desktop-owner))
|
|
|
|
;; Avoid desktop saving during evaluation of desktop buffer.
|
2015-02-16 04:18:25 +00:00
|
|
|
(desktop-save nil)
|
|
|
|
(desktop-autosave-was-enabled))
|
2007-06-12 09:11:31 +00:00
|
|
|
(if (and owner
|
2007-06-12 11:14:52 +00:00
|
|
|
(memq desktop-load-locked-desktop '(nil ask))
|
|
|
|
(or (null desktop-load-locked-desktop)
|
2012-06-21 07:15:42 +00:00
|
|
|
(daemonp)
|
2007-06-12 11:14:52 +00:00
|
|
|
(not (y-or-n-p (format "Warning: desktop file appears to be in use by PID %s.\n\
|
|
|
|
Using it may cause conflicts. Use it anyway? " owner)))))
|
2008-03-01 14:17:41 +00:00
|
|
|
(let ((default-directory desktop-dirname))
|
2007-06-20 10:12:44 +00:00
|
|
|
(setq desktop-dirname nil)
|
2008-03-01 14:17:41 +00:00
|
|
|
(run-hooks 'desktop-not-loaded-hook)
|
|
|
|
(unless desktop-dirname
|
|
|
|
(message "Desktop file in use; not loaded.")))
|
2007-06-12 09:11:31 +00:00
|
|
|
(desktop-lazy-abort)
|
2014-06-24 23:23:41 +00:00
|
|
|
;; Temporarily disable the autosave that will leave it
|
|
|
|
;; disabled when loading the desktop fails with errors,
|
|
|
|
;; thus not overwriting the desktop with broken contents.
|
2015-02-16 04:18:25 +00:00
|
|
|
(setq desktop-autosave-was-enabled
|
2018-03-14 16:14:01 +00:00
|
|
|
(memq #'desktop-auto-save-set-timer
|
|
|
|
;; Use the global value of the hook, in case some
|
2017-11-11 09:53:42 +00:00
|
|
|
;; feature makes window-configuration-change-hook
|
|
|
|
;; buffer-local, and puts there stuff which
|
|
|
|
;; doesn't include our timer.
|
2018-03-14 16:14:01 +00:00
|
|
|
(default-value
|
2017-11-11 09:53:42 +00:00
|
|
|
'window-configuration-change-hook)))
|
2014-06-24 23:23:41 +00:00
|
|
|
(desktop-auto-save-disable)
|
2007-06-12 09:11:31 +00:00
|
|
|
;; Evaluate desktop buffer and remember when it was modified.
|
file-attributes cleanup
Mostly, this replaces magic-number calls like (nth 4 A) with
more-informative calls like (file-attribute-access-time A).
It also fixes some documentation and minor timestamp coding
issues that I noticed while looking into this.
* doc/lispref/files.texi (File Attributes):
* lisp/files.el (file-attribute-size)
(file-attribute-inode-number, file-attribute-device-number):
* src/dired.c (Fdirectory_files_and_attributes)
(Ffile_attributes):
Mention which attributes must be integers, or nonnegative integers,
as opposed to merely being numbers. Remove no-longer-correct
talk about representing large integers as conses of integers.
* doc/lispref/files.texi (Magic File Names):
* doc/misc/gnus.texi (Low-level interface to the spam-stat dictionary):
* lisp/autorevert.el (auto-revert-find-file-function)
(auto-revert-tail-mode, auto-revert-handler):
* lisp/auth-source.el (auth-source-netrc-parse):
* lisp/cedet/ede/files.el (ede--inode-for-dir):
* lisp/cedet/semantic/db-file.el (object-write):
* lisp/cedet/semantic/db-mode.el (semanticdb-kill-hook):
* lisp/cedet/semantic/db.el (semanticdb-needs-refresh-p)
(semanticdb-synchronize):
* lisp/cedet/srecode/table.el (srecode-mode-table-new):
* lisp/desktop.el (desktop-save, desktop-read):
* lisp/dired-aux.el (dired-file-set-difference)
(dired-do-chxxx, dired-do-chmod, dired-copy-file-recursive)
(dired-create-files):
* lisp/dired.el (dired-directory-changed-p, dired-readin):
* lisp/dos-w32.el (w32-direct-print-region-helper):
* lisp/emacs-lisp/autoload.el (autoload-generate-file-autoloads)
(autoload-find-destination, update-directory-autoloads):
* lisp/emacs-lisp/shadow.el (load-path-shadows-same-file-or-nonexistent):
* lisp/epg.el (epg--start, epg-wait-for-completion):
* lisp/eshell/em-ls.el (eshell-ls-filetype-p)
(eshell-ls-applicable, eshell-ls-size-string)
(eshell-ls-file, eshell-ls-dir, eshell-ls-files)
(eshell-ls-entries):
* lisp/eshell/em-pred.el (eshell-predicate-alist)
(eshell-pred-file-type, eshell-pred-file-links)
(eshell-pred-file-size):
* lisp/eshell/em-unix.el (eshell-shuffle-files, eshell/cat)
(eshell-du-sum-directory, eshell/du):
* lisp/eshell/esh-util.el (eshell-read-passwd)
(eshell-read-hosts):
* lisp/files.el (remote-file-name-inhibit-cache)
(find-file-noselect, insert-file-1, dir-locals-find-file)
(dir-locals-read-from-dir, backup-buffer)
(file-ownership-preserved-p, copy-directory)
(read-file-modes):
* lisp/find-lisp.el (find-lisp-format):
* lisp/gnus/gnus-agent.el (gnus-agent-unfetch-articles)
(gnus-agent-read-agentview, gnus-agent-expire-group-1)
(gnus-agent-request-article, gnus-agent-regenerate-group)
(gnus-agent-update-files-total-fetched-for)
(gnus-agent-update-view-total-fetched-for):
* lisp/gnus/gnus-cache.el (gnus-cache-read-active)
(gnus-cache-update-file-total-fetched-for)
(gnus-cache-update-overview-total-fetched-for):
* lisp/gnus/gnus-cloud.el (gnus-cloud-file-new-p):
* lisp/gnus/gnus-score.el (gnus-score-score-files):
* lisp/gnus/gnus-start.el (gnus-save-newsrc-file)
(gnus-master-read-slave-newsrc):
* lisp/gnus/gnus-sum.el (gnus-summary-import-article):
* lisp/gnus/gnus-util.el (gnus-file-newer-than)
(gnus-cache-file-contents):
* lisp/gnus/mail-source.el (mail-source-delete-old-incoming)
(mail-source-callback, mail-source-movemail):
* lisp/gnus/nneething.el (nneething-create-mapping)
(nneething-make-head):
* lisp/gnus/nnfolder.el (nnfolder-read-folder):
* lisp/gnus/nnheader.el (nnheader-file-size)
(nnheader-insert-nov-file):
* lisp/gnus/nnmail.el (nnmail-activate):
* lisp/gnus/nnmaildir.el (nnmaildir--group-maxnum)
(nnmaildir--new-number, nnmaildir--update-nov)
(nnmaildir--scan, nnmaildir-request-scan)
(nnmaildir-request-update-info)
(nnmaildir-request-expire-articles):
* lisp/gnus/nnmh.el (nnmh-request-list-1)
(nnmh-request-expire-articles, nnmh-update-gnus-unreads):
* lisp/gnus/nnml.el (nnml-request-expire-articles):
* lisp/gnus/spam-stat.el (spam-stat-save, spam-stat-load)
(spam-stat-process-directory, spam-stat-test-directory):
* lisp/ido.el (ido-directory-too-big-p)
(ido-file-name-all-completions):
* lisp/image-dired.el (image-dired-get-thumbnail-image)
(image-dired-create-thumb-1):
* lisp/info.el (info-insert-file-contents):
* lisp/ls-lisp.el (ls-lisp-insert-directory)
(ls-lisp-handle-switches, ls-lisp-classify-file)
(ls-lisp-format):
* lisp/mail/blessmail.el:
* lisp/mail/feedmail.el (feedmail-default-date-generator)
(feedmail-default-message-id-generator):
* lisp/mail/mailabbrev.el (mail-abbrevs-sync-aliases)
(mail-abbrevs-setup):
* lisp/mail/mspools.el (mspools-size-folder):
* lisp/mail/rmail.el (rmail-insert-inbox-text):
* lisp/mail/sendmail.el (sendmail-sync-aliases):
* lisp/mh-e/mh-alias.el (mh-alias-tstamp):
* lisp/net/ange-ftp.el (ange-ftp-parse-netrc)
(ange-ftp-write-region, ange-ftp-file-newer-than-file-p)
(ange-ftp-cf1):
* lisp/net/eudcb-mab.el (eudc-mab-query-internal):
* lisp/net/eww.el (eww-read-bookmarks):
* lisp/net/netrc.el (netrc-parse):
* lisp/net/newst-backend.el (newsticker--image-get):
* lisp/nxml/rng-loc.el (rng-get-parsed-schema-locating-file):
* lisp/obsolete/fast-lock.el (fast-lock-save-cache):
* lisp/obsolete/vc-arch.el (vc-arch-state)
(vc-arch-diff3-rej-p):
* lisp/org/ob-eval.el (org-babel--shell-command-on-region):
* lisp/org/org-attach.el (org-attach-commit):
* lisp/org/org-macro.el (org-macro-initialize-templates):
* lisp/org/org.el (org-babel-load-file)
(org-file-newer-than-p):
* lisp/org/ox-html.el (org-html-format-spec):
* lisp/org/ox-publish.el (org-publish-find-date)
(org-publish-cache-ctime-of-src):
* lisp/pcmpl-gnu.el (pcomplete/tar):
* lisp/pcmpl-rpm.el (pcmpl-rpm-packages):
* lisp/play/cookie1.el (cookie-snarf):
* lisp/progmodes/cmacexp.el (c-macro-expansion):
* lisp/ps-bdf.el (bdf-file-mod-time):
* lisp/server.el (server-ensure-safe-dir):
* lisp/simple.el (shell-command-on-region):
* lisp/speedbar.el (speedbar-item-info-file-helper)
(speedbar-check-obj-this-line):
* lisp/thumbs.el (thumbs-cleanup-thumbsdir):
* lisp/time.el (display-time-mail-check-directory)
(display-time-file-nonempty-p):
* lisp/url/url-cache.el (url-is-cached):
* lisp/url/url-file.el (url-file-asynch-callback):
* lisp/vc/diff-mode.el (diff-delete-if-empty):
* lisp/vc/pcvs-info.el (cvs-fileinfo-from-entries):
* lisp/vc/vc-bzr.el (vc-bzr-state-heuristic):
* lisp/vc/vc-cvs.el (vc-cvs-checkout-model)
(vc-cvs-state-heuristic, vc-cvs-merge-news)
(vc-cvs-retrieve-tag, vc-cvs-parse-status, vc-cvs-parse-entry):
* lisp/vc/vc-hg.el (vc-hg--slurp-hgignore-1)
(vc-hg--ignore-patterns-valid-p)
(vc-hg--cached-dirstate-search, vc-hg-state-fast):
* lisp/vc/vc-hooks.el (vc-after-save):
* lisp/vc/vc-rcs.el (vc-rcs-workfile-is-newer):
* lisp/vc/vc-svn.el (vc-svn-merge-news, vc-svn-parse-status):
* lisp/vc/vc.el (vc-checkout, vc-checkin, vc-revert-file):
* lisp/xdg.el (xdg-mime-apps):
Prefer (file-attribute-size A) to (nth 7 A), and similarly
for other file attributes accessors.
* doc/lispref/files.texi (File Attributes):
* doc/lispref/intro.texi (Version Info):
* doc/lispref/os.texi (Idle Timers):
* lisp/erc/erc.el (erc-string-to-emacs-time):
* lisp/files.el (file-attribute-access-time)
(file-attribute-modification-time)
(file-attribute-status-change-time):
* lisp/net/tramp-compat.el:
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-size):
* src/buffer.c (syms_of_buffer):
* src/editfns.c (Fget_internal_run_time):
* src/fileio.c (Fvisited_file_modtime)
(Fset_visited_file_modtime):
* src/keyboard.c (Fcurrent_idle_time):
* src/process.c (Fprocess_attributes):
Defer implementation details about timestamp format to the
section that talks about timestamp format, to make it easier
to change the documentation later if timestamp formats are
extended.
* lisp/gnus/gnus-util.el (gnus-file-newer-than):
* lisp/speedbar.el (speedbar-check-obj-this-line):
* lisp/vc/vc-rcs.el (vc-rcs-workfile-is-newer):
Prefer time-less-p to doing it by hand.
* lisp/ls-lisp.el (ls-lisp-format): Inode numbers are no longer conses.
* lisp/vc/vc-bzr.el (vc-bzr-state-heuristic):
Use eql, not eq, to compare integers that might be bignums.
* lisp/org/ox-publish.el (org-publish-cache-ctime-of-src):
Prefer float-time to doing time arithmetic by hand.
2018-09-24 01:30:46 +00:00
|
|
|
(setq desktop-file-modtime (file-attribute-modification-time
|
|
|
|
(file-attributes
|
|
|
|
(desktop-full-file-name))))
|
2016-10-16 03:14:48 +00:00
|
|
|
(load (desktop-full-file-name) t t t)
|
2007-06-12 09:11:31 +00:00
|
|
|
;; If it wasn't already, mark it as in-use, to bother other
|
|
|
|
;; desktop instances.
|
2014-02-07 07:58:10 +00:00
|
|
|
(unless (eq (emacs-pid) owner)
|
2007-06-12 09:11:31 +00:00
|
|
|
(condition-case nil
|
|
|
|
(desktop-claim-lock)
|
|
|
|
(file-error (message "Couldn't record use of desktop file")
|
|
|
|
(sit-for 1))))
|
|
|
|
|
lisp/desktop.el: Move code related to saving frames to frameset.el.
Require frameset.
(desktop-restore-frames): Doc fix.
(desktop-restore-reuses-frames): Rename from
desktop-restoring-reuses-frames.
(desktop-saved-frameset): Rename from desktop-saved-frame-states.
(desktop-clear): Clear frames too.
(desktop-filter-parameters-alist): Set from frameset-filter-alist.
(desktop--filter-tty*, desktop-save, desktop-read):
Use frameset functions.
(desktop-before-saving-frames-functions, desktop--filter-*-color)
(desktop--filter-minibuffer, desktop--filter-restore-desktop-parm)
(desktop--filter-save-desktop-parm, desktop--filter-iconified-position)
(desktop-restore-in-original-display-p, desktop--filter-frame-parms)
(desktop--process-minibuffer-frames, desktop-save-frames)
(desktop--reuse-list, desktop--compute-pos, desktop--move-onscreen)
(desktop--find-frame, desktop--select-frame, desktop--make-frame)
(desktop--sort-states, desktop-restoring-frames-p)
(desktop-restore-frames): Remove. Most code moved to frameset.el.
(desktop-restoring-frameset-p, desktop-restore-frameset)
(desktop--check-dont-save, desktop-save-frameset): New functions.
(desktop--app-id): New constant.
(desktop-first-buffer, desktop-buffer-ok-count)
(desktop-buffer-fail-count): Move before first use.
lisp/frameset.el: New file.
2013-08-02 04:33:58 +00:00
|
|
|
(unless (desktop-restoring-frameset-p)
|
2013-07-21 17:45:12 +00:00
|
|
|
;; `desktop-create-buffer' puts buffers at end of the buffer list.
|
|
|
|
;; We want buffers existing prior to evaluating the desktop (and
|
|
|
|
;; not reused) to be placed at the end of the buffer list, so we
|
|
|
|
;; move them here.
|
2018-03-14 16:14:01 +00:00
|
|
|
(mapc #'bury-buffer
|
2013-07-21 17:45:12 +00:00
|
|
|
(nreverse (cdr (memq desktop-first-buffer (nreverse (buffer-list))))))
|
|
|
|
(switch-to-buffer (car (buffer-list))))
|
2007-06-12 09:11:31 +00:00
|
|
|
(run-hooks 'desktop-delay-hook)
|
|
|
|
(setq desktop-delay-hook nil)
|
lisp/desktop.el: Move code related to saving frames to frameset.el.
Require frameset.
(desktop-restore-frames): Doc fix.
(desktop-restore-reuses-frames): Rename from
desktop-restoring-reuses-frames.
(desktop-saved-frameset): Rename from desktop-saved-frame-states.
(desktop-clear): Clear frames too.
(desktop-filter-parameters-alist): Set from frameset-filter-alist.
(desktop--filter-tty*, desktop-save, desktop-read):
Use frameset functions.
(desktop-before-saving-frames-functions, desktop--filter-*-color)
(desktop--filter-minibuffer, desktop--filter-restore-desktop-parm)
(desktop--filter-save-desktop-parm, desktop--filter-iconified-position)
(desktop-restore-in-original-display-p, desktop--filter-frame-parms)
(desktop--process-minibuffer-frames, desktop-save-frames)
(desktop--reuse-list, desktop--compute-pos, desktop--move-onscreen)
(desktop--find-frame, desktop--select-frame, desktop--make-frame)
(desktop--sort-states, desktop-restoring-frames-p)
(desktop-restore-frames): Remove. Most code moved to frameset.el.
(desktop-restoring-frameset-p, desktop-restore-frameset)
(desktop--check-dont-save, desktop-save-frameset): New functions.
(desktop--app-id): New constant.
(desktop-first-buffer, desktop-buffer-ok-count)
(desktop-buffer-fail-count): Move before first use.
lisp/frameset.el: New file.
2013-08-02 04:33:58 +00:00
|
|
|
(desktop-restore-frameset)
|
2007-06-12 09:11:31 +00:00
|
|
|
(run-hooks 'desktop-after-read-hook)
|
lisp/desktop.el: Move code related to saving frames to frameset.el.
Require frameset.
(desktop-restore-frames): Doc fix.
(desktop-restore-reuses-frames): Rename from
desktop-restoring-reuses-frames.
(desktop-saved-frameset): Rename from desktop-saved-frame-states.
(desktop-clear): Clear frames too.
(desktop-filter-parameters-alist): Set from frameset-filter-alist.
(desktop--filter-tty*, desktop-save, desktop-read):
Use frameset functions.
(desktop-before-saving-frames-functions, desktop--filter-*-color)
(desktop--filter-minibuffer, desktop--filter-restore-desktop-parm)
(desktop--filter-save-desktop-parm, desktop--filter-iconified-position)
(desktop-restore-in-original-display-p, desktop--filter-frame-parms)
(desktop--process-minibuffer-frames, desktop-save-frames)
(desktop--reuse-list, desktop--compute-pos, desktop--move-onscreen)
(desktop--find-frame, desktop--select-frame, desktop--make-frame)
(desktop--sort-states, desktop-restoring-frames-p)
(desktop-restore-frames): Remove. Most code moved to frameset.el.
(desktop-restoring-frameset-p, desktop-restore-frameset)
(desktop--check-dont-save, desktop-save-frameset): New functions.
(desktop--app-id): New constant.
(desktop-first-buffer, desktop-buffer-ok-count)
(desktop-buffer-fail-count): Move before first use.
lisp/frameset.el: New file.
2013-08-02 04:33:58 +00:00
|
|
|
(message "Desktop: %s%d buffer%s restored%s%s."
|
|
|
|
(if desktop-saved-frameset
|
|
|
|
(let ((fn (length (frameset-states desktop-saved-frameset))))
|
|
|
|
(format "%d frame%s, "
|
|
|
|
fn (if (= fn 1) "" "s")))
|
|
|
|
"")
|
2007-06-12 09:11:31 +00:00
|
|
|
desktop-buffer-ok-count
|
|
|
|
(if (= 1 desktop-buffer-ok-count) "" "s")
|
|
|
|
(if (< 0 desktop-buffer-fail-count)
|
|
|
|
(format ", %d failed to restore" desktop-buffer-fail-count)
|
|
|
|
"")
|
|
|
|
(if desktop-buffer-args-list
|
|
|
|
(format ", %d to restore lazily"
|
|
|
|
(length desktop-buffer-args-list))
|
|
|
|
""))
|
lisp/desktop.el: Move code related to saving frames to frameset.el.
Require frameset.
(desktop-restore-frames): Doc fix.
(desktop-restore-reuses-frames): Rename from
desktop-restoring-reuses-frames.
(desktop-saved-frameset): Rename from desktop-saved-frame-states.
(desktop-clear): Clear frames too.
(desktop-filter-parameters-alist): Set from frameset-filter-alist.
(desktop--filter-tty*, desktop-save, desktop-read):
Use frameset functions.
(desktop-before-saving-frames-functions, desktop--filter-*-color)
(desktop--filter-minibuffer, desktop--filter-restore-desktop-parm)
(desktop--filter-save-desktop-parm, desktop--filter-iconified-position)
(desktop-restore-in-original-display-p, desktop--filter-frame-parms)
(desktop--process-minibuffer-frames, desktop-save-frames)
(desktop--reuse-list, desktop--compute-pos, desktop--move-onscreen)
(desktop--find-frame, desktop--select-frame, desktop--make-frame)
(desktop--sort-states, desktop-restoring-frames-p)
(desktop-restore-frames): Remove. Most code moved to frameset.el.
(desktop-restoring-frameset-p, desktop-restore-frameset)
(desktop--check-dont-save, desktop-save-frameset): New functions.
(desktop--app-id): New constant.
(desktop-first-buffer, desktop-buffer-ok-count)
(desktop-buffer-fail-count): Move before first use.
lisp/frameset.el: New file.
2013-08-02 04:33:58 +00:00
|
|
|
(unless (desktop-restoring-frameset-p)
|
2013-07-21 17:45:12 +00:00
|
|
|
;; Bury the *Messages* buffer to not reshow it when burying
|
|
|
|
;; the buffer we switched to above.
|
|
|
|
(when (buffer-live-p (get-buffer "*Messages*"))
|
|
|
|
(bury-buffer "*Messages*"))
|
|
|
|
;; Clear all windows' previous and next buffers, these have
|
|
|
|
;; been corrupted by the `switch-to-buffer' calls in
|
|
|
|
;; `desktop-restore-file-buffer' (bug#11556). This is a
|
|
|
|
;; brute force fix and should be replaced by a more subtle
|
|
|
|
;; strategy eventually.
|
|
|
|
(walk-window-tree (lambda (window)
|
|
|
|
(set-window-prev-buffers window nil)
|
|
|
|
(set-window-next-buffers window nil))))
|
2013-08-04 00:31:33 +00:00
|
|
|
(setq desktop-saved-frameset nil)
|
2015-02-16 04:18:25 +00:00
|
|
|
(if desktop-autosave-was-enabled (desktop-auto-save-enable))
|
2007-06-12 09:11:31 +00:00
|
|
|
t))
|
2004-04-16 12:51:06 +00:00
|
|
|
;; No desktop file found.
|
|
|
|
(let ((default-directory desktop-dirname))
|
|
|
|
(run-hooks 'desktop-no-desktop-file-hook))
|
|
|
|
(message "No desktop file.")
|
|
|
|
nil)))
|
2003-04-09 01:37:56 +00:00
|
|
|
|
|
|
|
;; ----------------------------------------------------------------------------
|
|
|
|
;;;###autoload
|
2004-04-16 12:51:06 +00:00
|
|
|
(defun desktop-change-dir (dirname)
|
|
|
|
"Change to desktop saved in DIRNAME.
|
|
|
|
Kill the desktop as specified by variables `desktop-save-mode' and
|
|
|
|
`desktop-save', then clear the desktop and load the desktop file in
|
|
|
|
directory DIRNAME."
|
|
|
|
(interactive "DChange to directory: ")
|
|
|
|
(setq dirname (file-name-as-directory (expand-file-name dirname desktop-dirname)))
|
2003-04-09 01:37:56 +00:00
|
|
|
(desktop-kill)
|
|
|
|
(desktop-clear)
|
2004-04-16 12:51:06 +00:00
|
|
|
(desktop-read dirname))
|
2005-02-09 15:50:47 +00:00
|
|
|
|
2004-04-16 12:51:06 +00:00
|
|
|
;; ----------------------------------------------------------------------------
|
2003-04-09 01:37:56 +00:00
|
|
|
;;;###autoload
|
2004-04-16 12:51:06 +00:00
|
|
|
(defun desktop-save-in-desktop-dir ()
|
|
|
|
"Save the desktop in directory `desktop-dirname'."
|
2003-04-09 01:37:56 +00:00
|
|
|
(interactive)
|
|
|
|
(if desktop-dirname
|
2005-07-29 10:25:15 +00:00
|
|
|
(desktop-save desktop-dirname)
|
2003-04-09 01:37:56 +00:00
|
|
|
(call-interactively 'desktop-save))
|
2009-01-05 02:49:31 +00:00
|
|
|
(message "Desktop saved in %s" (abbreviate-file-name desktop-dirname)))
|
2003-04-09 01:37:56 +00:00
|
|
|
|
2013-04-27 20:55:00 +00:00
|
|
|
;; ----------------------------------------------------------------------------
|
|
|
|
;; Auto-Saving.
|
|
|
|
(defvar desktop-auto-save-timer nil)
|
|
|
|
|
2014-06-24 23:23:41 +00:00
|
|
|
(defun desktop-auto-save-enable (&optional timeout)
|
|
|
|
(when (and (integerp (or timeout desktop-auto-save-timeout))
|
|
|
|
(> (or timeout desktop-auto-save-timeout) 0))
|
2018-03-14 16:14:01 +00:00
|
|
|
(add-hook 'window-configuration-change-hook #'desktop-auto-save-set-timer)))
|
2014-06-24 23:23:41 +00:00
|
|
|
|
|
|
|
(defun desktop-auto-save-disable ()
|
2018-03-14 16:14:01 +00:00
|
|
|
(remove-hook 'window-configuration-change-hook #'desktop-auto-save-set-timer)
|
2014-06-24 23:23:41 +00:00
|
|
|
(desktop-auto-save-cancel-timer))
|
|
|
|
|
2013-04-27 20:55:00 +00:00
|
|
|
(defun desktop-auto-save ()
|
|
|
|
"Save the desktop periodically.
|
|
|
|
Called by the timer created in `desktop-auto-save-set-timer'."
|
|
|
|
(when (and desktop-save-mode
|
|
|
|
(integerp desktop-auto-save-timeout)
|
|
|
|
(> desktop-auto-save-timeout 0)
|
|
|
|
;; Avoid desktop saving during lazy loading.
|
|
|
|
(not desktop-lazy-timer)
|
|
|
|
;; Save only to own desktop file.
|
|
|
|
(eq (emacs-pid) (desktop-owner))
|
|
|
|
desktop-dirname)
|
2013-12-16 21:48:51 +00:00
|
|
|
(desktop-save desktop-dirname nil t)))
|
2013-04-27 20:55:00 +00:00
|
|
|
|
|
|
|
(defun desktop-auto-save-set-timer ()
|
2017-10-28 12:11:08 +00:00
|
|
|
"Set the desktop auto-save timer.
|
2013-04-27 20:55:00 +00:00
|
|
|
Cancel any previous timer. When `desktop-auto-save-timeout' is a positive
|
2017-10-28 12:11:08 +00:00
|
|
|
integer, start a new idle timer to call `desktop-auto-save' after that many
|
|
|
|
seconds of idle time.
|
|
|
|
This function is called from `window-configuration-change-hook'."
|
2014-02-07 07:44:29 +00:00
|
|
|
(desktop-auto-save-cancel-timer)
|
2013-04-27 20:55:00 +00:00
|
|
|
(when (and (integerp desktop-auto-save-timeout)
|
|
|
|
(> desktop-auto-save-timeout 0))
|
|
|
|
(setq desktop-auto-save-timer
|
2014-06-06 23:38:40 +00:00
|
|
|
(run-with-idle-timer desktop-auto-save-timeout nil
|
2013-12-16 21:48:51 +00:00
|
|
|
'desktop-auto-save))))
|
2013-04-27 20:55:00 +00:00
|
|
|
|
2014-02-07 07:44:29 +00:00
|
|
|
(defun desktop-auto-save-cancel-timer ()
|
|
|
|
(when desktop-auto-save-timer
|
|
|
|
(cancel-timer desktop-auto-save-timer)
|
|
|
|
(setq desktop-auto-save-timer nil)))
|
|
|
|
|
2003-04-09 01:37:56 +00:00
|
|
|
;; ----------------------------------------------------------------------------
|
|
|
|
;;;###autoload
|
|
|
|
(defun desktop-revert ()
|
|
|
|
"Revert to the last loaded desktop."
|
|
|
|
(interactive)
|
2004-04-16 12:51:06 +00:00
|
|
|
(unless desktop-dirname
|
|
|
|
(error "Unknown desktop directory"))
|
2006-06-23 21:42:33 +00:00
|
|
|
(unless (file-exists-p (desktop-full-file-name))
|
2004-04-16 12:51:06 +00:00
|
|
|
(error "No desktop file found"))
|
|
|
|
(desktop-clear)
|
|
|
|
(desktop-read desktop-dirname))
|
2003-04-09 01:37:56 +00:00
|
|
|
|
2007-04-11 02:28:26 +00:00
|
|
|
(defvar desktop-buffer-major-mode)
|
|
|
|
(defvar desktop-buffer-locals)
|
2011-04-19 13:44:55 +00:00
|
|
|
(defvar auto-insert) ; from autoinsert.el
|
1993-10-07 16:50:26 +00:00
|
|
|
;; ----------------------------------------------------------------------------
|
2011-04-19 13:44:55 +00:00
|
|
|
(defun desktop-restore-file-buffer (buffer-filename
|
|
|
|
_buffer-name
|
|
|
|
_buffer-misc)
|
2004-04-21 20:53:35 +00:00
|
|
|
"Restore a file buffer."
|
2011-04-19 13:44:55 +00:00
|
|
|
(when buffer-filename
|
|
|
|
(if (or (file-exists-p buffer-filename)
|
2007-06-12 11:14:52 +00:00
|
|
|
(let ((msg (format "Desktop: File \"%s\" no longer exists."
|
2011-04-19 13:44:55 +00:00
|
|
|
buffer-filename)))
|
2007-06-12 11:14:52 +00:00
|
|
|
(if desktop-missing-file-warning
|
|
|
|
(y-or-n-p (concat msg " Re-create buffer? "))
|
|
|
|
(message "%s" msg)
|
|
|
|
nil)))
|
|
|
|
(let* ((auto-insert nil) ; Disable auto insertion
|
|
|
|
(coding-system-for-read
|
|
|
|
(or coding-system-for-read
|
|
|
|
(cdr (assq 'buffer-file-coding-system
|
|
|
|
desktop-buffer-locals))))
|
2016-07-22 18:48:12 +00:00
|
|
|
(buf (find-file-noselect buffer-filename :nowarn)))
|
2007-06-12 11:14:52 +00:00
|
|
|
(condition-case nil
|
|
|
|
(switch-to-buffer buf)
|
|
|
|
(error (pop-to-buffer buf)))
|
|
|
|
(and (not (eq major-mode desktop-buffer-major-mode))
|
|
|
|
(functionp desktop-buffer-major-mode)
|
|
|
|
(funcall desktop-buffer-major-mode))
|
|
|
|
buf)
|
|
|
|
nil)))
|
2003-04-09 01:37:56 +00:00
|
|
|
|
2005-08-10 19:38:52 +00:00
|
|
|
(defun desktop-load-file (function)
|
2015-05-26 06:27:55 +00:00
|
|
|
"Load the file where auto loaded FUNCTION is defined.
|
|
|
|
If FUNCTION is not currently defined, guess the library that defines it
|
|
|
|
and try to load that."
|
|
|
|
(if (fboundp function)
|
|
|
|
(autoload-do-load (symbol-function function) function)
|
|
|
|
;; Guess that foobar-mode is defined in foobar.
|
|
|
|
;; TODO rather than guessing or requiring an autoload, the desktop
|
|
|
|
;; file should record the name of the library.
|
|
|
|
(let ((name (symbol-name function)))
|
|
|
|
(if (string-match "\\`\\(.*\\)-mode\\'" name)
|
|
|
|
(with-demoted-errors "Require error in desktop-load-file: %S"
|
|
|
|
(require (intern (match-string 1 name)) nil t))))))
|
2005-08-10 19:38:52 +00:00
|
|
|
|
1993-10-07 16:50:26 +00:00
|
|
|
;; ----------------------------------------------------------------------------
|
2004-04-27 06:52:35 +00:00
|
|
|
;; Create a buffer, load its file, set its mode, ...;
|
|
|
|
;; called from Desktop file only.
|
2001-10-23 13:52:45 +00:00
|
|
|
|
2004-09-09 19:45:03 +00:00
|
|
|
(defun desktop-create-buffer
|
2011-04-19 13:44:55 +00:00
|
|
|
(file-version
|
|
|
|
buffer-filename
|
|
|
|
buffer-name
|
|
|
|
buffer-majormode
|
|
|
|
buffer-minormodes
|
|
|
|
buffer-point
|
|
|
|
buffer-mark
|
|
|
|
buffer-readonly
|
|
|
|
buffer-misc
|
|
|
|
&optional
|
2015-02-09 13:25:53 +00:00
|
|
|
buffer-locals
|
|
|
|
compacted-vars
|
|
|
|
&rest _unsupported)
|
2011-04-19 13:44:55 +00:00
|
|
|
|
2016-01-18 13:32:22 +00:00
|
|
|
(setq desktop-io-file-version file-version)
|
|
|
|
|
2011-04-19 13:44:55 +00:00
|
|
|
(let ((desktop-file-version file-version)
|
|
|
|
(desktop-buffer-file-name buffer-filename)
|
|
|
|
(desktop-buffer-name buffer-name)
|
|
|
|
(desktop-buffer-major-mode buffer-majormode)
|
|
|
|
(desktop-buffer-minor-modes buffer-minormodes)
|
|
|
|
(desktop-buffer-point buffer-point)
|
|
|
|
(desktop-buffer-mark buffer-mark)
|
|
|
|
(desktop-buffer-read-only buffer-readonly)
|
|
|
|
(desktop-buffer-misc buffer-misc)
|
|
|
|
(desktop-buffer-locals buffer-locals))
|
|
|
|
;; To make desktop files with relative file names possible, we cannot
|
|
|
|
;; allow `default-directory' to change. Therefore we save current buffer.
|
|
|
|
(save-current-buffer
|
|
|
|
;; Give major mode module a chance to add a handler.
|
|
|
|
(desktop-load-file desktop-buffer-major-mode)
|
|
|
|
(let ((buffer-list (buffer-list))
|
|
|
|
(result
|
2012-02-10 15:59:29 +00:00
|
|
|
(condition-case-unless-debug err
|
2011-04-19 13:44:55 +00:00
|
|
|
(funcall (or (cdr (assq desktop-buffer-major-mode
|
|
|
|
desktop-buffer-mode-handlers))
|
|
|
|
'desktop-restore-file-buffer)
|
|
|
|
desktop-buffer-file-name
|
|
|
|
desktop-buffer-name
|
|
|
|
desktop-buffer-misc)
|
|
|
|
(error
|
|
|
|
(message "Desktop: Can't load buffer %s: %s"
|
|
|
|
desktop-buffer-name
|
|
|
|
(error-message-string err))
|
|
|
|
(when desktop-missing-file-warning (sit-for 1))
|
|
|
|
nil))))
|
|
|
|
(if (bufferp result)
|
|
|
|
(setq desktop-buffer-ok-count (1+ desktop-buffer-ok-count))
|
|
|
|
(setq desktop-buffer-fail-count (1+ desktop-buffer-fail-count))
|
|
|
|
(setq result nil))
|
|
|
|
;; Restore buffer list order with new buffer at end. Don't change
|
2011-11-14 23:59:56 +00:00
|
|
|
;; the order for old desktop files (old desktop module behavior).
|
2011-04-19 13:44:55 +00:00
|
|
|
(unless (< desktop-file-version 206)
|
2014-09-10 00:47:20 +00:00
|
|
|
(dolist (buf buffer-list)
|
|
|
|
(and (buffer-live-p buf)
|
|
|
|
(bury-buffer buf)))
|
2011-04-19 13:44:55 +00:00
|
|
|
(when result (bury-buffer result)))
|
|
|
|
(when result
|
|
|
|
(unless (or desktop-first-buffer (< desktop-file-version 206))
|
|
|
|
(setq desktop-first-buffer result))
|
|
|
|
(set-buffer result)
|
|
|
|
(unless (equal (buffer-name) desktop-buffer-name)
|
|
|
|
(rename-buffer desktop-buffer-name t))
|
|
|
|
;; minor modes
|
|
|
|
(cond ((equal '(t) desktop-buffer-minor-modes) ; backwards compatible
|
|
|
|
(auto-fill-mode 1))
|
|
|
|
((equal '(nil) desktop-buffer-minor-modes) ; backwards compatible
|
|
|
|
(auto-fill-mode 0))
|
|
|
|
(t
|
|
|
|
(dolist (minor-mode desktop-buffer-minor-modes)
|
|
|
|
;; Give minor mode module a chance to add a handler.
|
|
|
|
(desktop-load-file minor-mode)
|
|
|
|
(let ((handler (cdr (assq minor-mode desktop-minor-mode-handlers))))
|
|
|
|
(if handler
|
|
|
|
(funcall handler desktop-buffer-locals)
|
|
|
|
(when (functionp minor-mode)
|
|
|
|
(funcall minor-mode 1)))))))
|
|
|
|
;; Even though point and mark are non-nil when written by
|
|
|
|
;; `desktop-save', they may be modified by handlers wanting to set
|
|
|
|
;; point or mark themselves.
|
|
|
|
(when desktop-buffer-point
|
|
|
|
(goto-char
|
|
|
|
(condition-case err
|
|
|
|
;; Evaluate point. Thus point can be something like
|
|
|
|
;; '(search-forward ...
|
|
|
|
(eval desktop-buffer-point)
|
|
|
|
(error (message "%s" (error-message-string err)) 1))))
|
|
|
|
(when desktop-buffer-mark
|
2014-03-10 02:18:29 +00:00
|
|
|
(if (consp desktop-buffer-mark)
|
|
|
|
(progn
|
|
|
|
(move-marker (mark-marker) (car desktop-buffer-mark))
|
2014-11-21 18:01:40 +00:00
|
|
|
(if (car (cdr desktop-buffer-mark))
|
|
|
|
(activate-mark 'dont-touch-tmm)))
|
2014-03-10 02:18:29 +00:00
|
|
|
(move-marker (mark-marker) desktop-buffer-mark)))
|
2011-04-19 13:44:55 +00:00
|
|
|
;; Never override file system if the file really is read-only marked.
|
|
|
|
(when desktop-buffer-read-only (setq buffer-read-only desktop-buffer-read-only))
|
2013-07-23 01:10:54 +00:00
|
|
|
(dolist (this desktop-buffer-locals)
|
|
|
|
(if (consp this)
|
2014-03-10 02:18:29 +00:00
|
|
|
;; An entry of this form `(symbol . value)'.
|
2013-07-23 01:10:54 +00:00
|
|
|
(progn
|
|
|
|
(make-local-variable (car this))
|
|
|
|
(set (car this) (cdr this)))
|
2014-03-10 02:18:29 +00:00
|
|
|
;; An entry of the form `symbol'.
|
2013-07-23 01:10:54 +00:00
|
|
|
(make-local-variable this)
|
2015-02-09 13:25:53 +00:00
|
|
|
(makunbound this)))
|
2016-10-16 03:14:48 +00:00
|
|
|
;; adjust `buffer-display-time' for the downtime. e.g.,
|
|
|
|
;; * if `buffer-display-time' was 8:00
|
|
|
|
;; * and emacs stopped at `desktop-file-modtime' == 11:00
|
|
|
|
;; * and we are loading the desktop file at (current-time) 12:30,
|
|
|
|
;; -> then we restore `buffer-display-time' as 9:30,
|
|
|
|
;; for the sake of `clean-buffer-list': preserving the invariant
|
|
|
|
;; "how much time the user spent in Emacs without looking at this buffer".
|
|
|
|
(setq buffer-display-time
|
Avoid some double-rounding of Lisp timestamps
Also, simplify some time-related Lisp timestamp code
while we’re in the neighborhood.
* lisp/battery.el (battery-linux-proc-acpi)
(battery-linux-sysfs, battery-upower, battery-bsd-apm):
* lisp/calendar/timeclock.el (timeclock-seconds-to-string)
(timeclock-log, timeclock-last-period)
(timeclock-entry-length, timeclock-entry-list-span)
(timeclock-find-discrep, timeclock-generate-report):
* lisp/cedet/ede/detect.el (ede-detect-qtest):
* lisp/completion.el (cmpl-hours-since-origin):
* lisp/ecomplete.el (ecomplete-decay-1):
* lisp/emacs-lisp/ert.el (ert--results-update-stats-display)
(ert--results-update-stats-display-maybe):
* lisp/emacs-lisp/timer-list.el (list-timers):
* lisp/emacs-lisp/timer.el (timer-until)
(timer-event-handler):
* lisp/erc/erc-backend.el (erc-server-send-ping)
(erc-server-send-queue, erc-handle-parsed-server-response)
(erc-handle-unknown-server-response):
* lisp/erc/erc-track.el (erc-buffer-visible):
* lisp/erc/erc.el (erc-lurker-cleanup, erc-lurker-p)
(erc-cmd-PING, erc-send-current-line):
* lisp/eshell/em-pred.el (eshell-pred-file-time):
* lisp/eshell/em-unix.el (eshell-show-elapsed-time):
* lisp/gnus/gnus-icalendar.el (gnus-icalendar-event:org-timestamp):
* lisp/gnus/gnus-int.el (gnus-backend-trace):
* lisp/gnus/gnus-sum.el (gnus-user-date):
* lisp/gnus/mail-source.el (mail-source-delete-crash-box):
* lisp/gnus/nnmaildir.el (nnmaildir--scan):
* lisp/ibuf-ext.el (ibuffer-mark-old-buffers):
* lisp/gnus/nnmaildir.el (nnmaildir--scan):
* lisp/mouse.el (mouse--down-1-maybe-follows-link)
(mouse--click-1-maybe-follows-link):
* lisp/mpc.el (mpc--faster-toggle):
* lisp/net/rcirc.el (rcirc-handler-ctcp-KEEPALIVE)
(rcirc-sentinel):
* lisp/net/tramp-cache.el (tramp-get-file-property):
* lisp/net/tramp-sh.el (tramp-sh-handle-file-newer-than-file-p)
(tramp-maybe-open-connection):
* lisp/net/tramp-smb.el (tramp-smb-maybe-open-connection):
* lisp/org/org-clock.el (org-clock-resolve):
(org-resolve-clocks, org-clock-in, org-clock-out, org-clock-sum):
* lisp/org/org-timer.el (org-timer-start)
(org-timer-pause-or-continue, org-timer-seconds):
* lisp/org/org.el (org-evaluate-time-range):
* lisp/org/ox-publish.el (org-publish-cache-ctime-of-src):
* lisp/pixel-scroll.el (pixel-scroll-in-rush-p):
* lisp/play/hanoi.el (hanoi-move-ring):
* lisp/proced.el (proced-format-time):
* lisp/progmodes/cpp.el (cpp-progress-message):
* lisp/progmodes/flymake.el (flymake--handle-report):
* lisp/progmodes/js.el (js--wait-for-matching-output):
* lisp/subr.el (progress-reporter-do-update):
* lisp/term/xterm.el (xterm--read-event-for-query):
* lisp/time.el (display-time-update, emacs-uptime):
* lisp/tooltip.el (tooltip-delay):
* lisp/url/url-cookie.el (url-cookie-parse-file-netscape):
* lisp/url/url-queue.el (url-queue-prune-old-entries):
* lisp/url/url.el (url-retrieve-synchronously):
* lisp/xt-mouse.el (xterm-mouse-event):
Avoid double-rounding of time-related values. Simplify.
* lisp/calendar/icalendar.el (icalendar--decode-isodatetime):
When hoping for the best (unlikely), use a better decoded time.
(icalendar--convert-sexp-to-ical): Avoid unnecessary encode-time.
* lisp/calendar/timeclock.el (timeclock-when-to-leave):
* lisp/cedet/ede/detect.el (ede-detect-qtest):
* lisp/desktop.el (desktop-create-buffer):
* lisp/emacs-lisp/benchmark.el (benchmark-elapse):
* lisp/gnus/gnus-art.el (article-lapsed-string):
* lisp/gnus/gnus-group.el (gnus-group-timestamp-delta):
* lisp/gnus/nnmail.el (nnmail-expired-article-p):
* lisp/gnus/nnmaildir.el (nnmaildir-request-expire-articles):
* lisp/nxml/rng-maint.el (rng-time-function):
* lisp/org/org-clock.el (org-clock-get-clocked-time)
(org-clock-resolve, org-resolve-clocks, org-resolve-clocks-if-idle):
* lisp/org/org-habit.el (org-habit-insert-consistency-graphs):
* lisp/progmodes/vhdl-mode.el (vhdl-update-progress-info)
(vhdl-fix-case-region-1):
Use time-since instead of open-coding most of it.
* lisp/erc/erc-dcc.el (erc-dcc-get-sentinel):
* lisp/erc/erc.el (erc-string-to-emacs-time, erc-time-gt):
Now obsolete. All uses changed.
(erc-time-diff): Accept all Lisp time values.
All uses changed.
* lisp/gnus/gnus-demon.el (gnus-demon-idle-since):
* lisp/gnus/gnus-score.el (gnus-score-headers):
* lisp/gnus/nneething.el (nneething-make-head):
* lisp/gnus/nnheader.el (nnheader-message-maybe):
* lisp/gnus/nnimap.el (nnimap-keepalive):
* lisp/image.el (image-animate-timeout):
* lisp/mail/feedmail.el (feedmail-rfc822-date):
* lisp/net/imap.el (imap-wait-for-tag):
* lisp/net/newst-backend.el (newsticker--image-get):
* lisp/net/rcirc.el (rcirc-handler-317, rcirc-handler-333):
* lisp/obsolete/xesam.el (xesam-refresh-entry):
* lisp/org/org-agenda.el (org-agenda-show-clocking-issues)
(org-agenda-check-clock-gap, org-agenda-to-appt):
* lisp/org/org-capture.el (org-capture-set-target-location):
* lisp/org/org-clock.el (org-clock-resolve-clock)
(org-clocktable-steps):
* lisp/org/org-colview.el (org-columns-edit-value)
(org-columns, org-agenda-columns):
* lisp/org/org-duration.el (org-duration-from-minutes):
* lisp/org/org-element.el (org-element-cache-sync-duration)
(org-element-cache-sync-break)
(org-element--cache-interrupt-p, org-element--cache-sync):
* lisp/org/org-habit.el (org-habit-get-faces)
* lisp/org/org-indent.el (org-indent-add-properties):
* lisp/org/org-table.el (org-table-sum):
* lisp/org/org-timer.el (org-timer-show-remaining-time)
(org-timer-set-timer):
* lisp/org/org.el (org-babel-load-file, org-today)
(org-auto-repeat-maybe, org-2ft, org-time-stamp)
(org-read-date-analyze, org-time-stamp-to-now)
(org-small-year-to-year, org-goto-calendar):
* lisp/org/ox.el (org-export-insert-default-template):
* lisp/ses.el (ses--time-check):
* lisp/type-break.el (type-break-time-warning)
(type-break-statistics, type-break-demo-boring):
* lisp/url/url-cache.el (url-cache-expired)
(url-cache-prune-cache):
* lisp/vc/vc-git.el (vc-git-stash-snapshot):
* lisp/erc/erc-match.el (erc-log-matches-come-back):
Simplify.
2019-02-23 02:32:31 +00:00
|
|
|
(time-since (if buffer-display-time
|
|
|
|
(time-subtract desktop-file-modtime
|
|
|
|
buffer-display-time)
|
|
|
|
0)))
|
2015-02-09 13:25:53 +00:00
|
|
|
(unless (< desktop-file-version 208) ; Don't misinterpret any old custom args
|
|
|
|
(dolist (record compacted-vars)
|
|
|
|
(let*
|
|
|
|
((var (car record))
|
2015-04-10 05:50:22 +00:00
|
|
|
(deser-fun (nth 2 (assq var desktop-var-serdes-funs))))
|
2015-02-09 13:25:53 +00:00
|
|
|
(if deser-fun (set var (funcall deser-fun (cadr record))))))))
|
|
|
|
result))))
|
1994-01-06 11:34:51 +00:00
|
|
|
|
2003-04-09 01:37:56 +00:00
|
|
|
;; ----------------------------------------------------------------------------
|
1994-01-06 11:34:51 +00:00
|
|
|
;; Backward compatibility -- update parameters to 205 standards.
|
2011-04-19 13:44:55 +00:00
|
|
|
(defun desktop-buffer (buffer-filename buffer-name buffer-majormode
|
|
|
|
mim pt mk ro tl fc cfs cr buffer-misc)
|
|
|
|
(desktop-create-buffer 205 buffer-filename buffer-name
|
|
|
|
buffer-majormode (cdr mim) pt mk ro
|
|
|
|
buffer-misc
|
1994-01-06 11:34:51 +00:00
|
|
|
(list (cons 'truncate-lines tl)
|
|
|
|
(cons 'fill-column fc)
|
|
|
|
(cons 'case-fold-search cfs)
|
|
|
|
(cons 'case-replace cr)
|
|
|
|
(cons 'overwrite-mode (car mim)))))
|
2003-04-10 16:26:12 +00:00
|
|
|
|
2005-01-07 20:18:59 +00:00
|
|
|
(defun desktop-append-buffer-args (&rest args)
|
2005-07-19 09:54:05 +00:00
|
|
|
"Append ARGS at end of `desktop-buffer-args-list'.
|
2005-01-07 20:18:59 +00:00
|
|
|
ARGS must be an argument list for `desktop-create-buffer'."
|
|
|
|
(setq desktop-buffer-args-list (nconc desktop-buffer-args-list (list args)))
|
|
|
|
(unless desktop-lazy-timer
|
|
|
|
(setq desktop-lazy-timer
|
|
|
|
(run-with-idle-timer desktop-lazy-idle-delay t 'desktop-idle-create-buffers))))
|
|
|
|
|
|
|
|
(defun desktop-lazy-create-buffer ()
|
|
|
|
"Pop args from `desktop-buffer-args-list', create buffer and bury it."
|
|
|
|
(when desktop-buffer-args-list
|
|
|
|
(let* ((remaining (length desktop-buffer-args-list))
|
|
|
|
(args (pop desktop-buffer-args-list))
|
|
|
|
(buffer-name (nth 2 args))
|
|
|
|
(msg (format "Desktop lazily opening %s (%s remaining)..."
|
|
|
|
buffer-name remaining)))
|
|
|
|
(when desktop-lazy-verbose
|
2005-09-18 12:25:02 +00:00
|
|
|
(message "%s" msg))
|
2005-01-07 20:18:59 +00:00
|
|
|
(let ((desktop-first-buffer nil)
|
|
|
|
(desktop-buffer-ok-count 0)
|
|
|
|
(desktop-buffer-fail-count 0))
|
2018-03-14 16:14:01 +00:00
|
|
|
(apply #'desktop-create-buffer args)
|
2005-01-07 20:18:59 +00:00
|
|
|
(run-hooks 'desktop-delay-hook)
|
|
|
|
(setq desktop-delay-hook nil)
|
|
|
|
(bury-buffer (get-buffer buffer-name))
|
|
|
|
(when desktop-lazy-verbose
|
|
|
|
(message "%s%s" msg (if (> desktop-buffer-ok-count 0) "done" "failed")))))))
|
|
|
|
|
|
|
|
(defun desktop-idle-create-buffers ()
|
|
|
|
"Create buffers until the user does something, then stop.
|
|
|
|
If there are no buffers left to create, kill the timer."
|
|
|
|
(let ((repeat 1))
|
|
|
|
(while (and repeat desktop-buffer-args-list)
|
|
|
|
(save-window-excursion
|
|
|
|
(desktop-lazy-create-buffer))
|
|
|
|
(setq repeat (sit-for 0.2))
|
|
|
|
(unless desktop-buffer-args-list
|
|
|
|
(cancel-timer desktop-lazy-timer)
|
|
|
|
(setq desktop-lazy-timer nil)
|
|
|
|
(message "Lazy desktop load complete")
|
|
|
|
(sit-for 3)
|
|
|
|
(message "")))))
|
|
|
|
|
|
|
|
(defun desktop-lazy-complete ()
|
|
|
|
"Run the desktop load to completion."
|
|
|
|
(interactive)
|
|
|
|
(let ((desktop-lazy-verbose t))
|
|
|
|
(while desktop-buffer-args-list
|
|
|
|
(save-window-excursion
|
|
|
|
(desktop-lazy-create-buffer)))
|
|
|
|
(message "Lazy desktop load complete")))
|
|
|
|
|
|
|
|
(defun desktop-lazy-abort ()
|
|
|
|
"Abort lazy loading of the desktop."
|
|
|
|
(interactive)
|
|
|
|
(when desktop-lazy-timer
|
|
|
|
(cancel-timer desktop-lazy-timer)
|
|
|
|
(setq desktop-lazy-timer nil))
|
|
|
|
(when desktop-buffer-args-list
|
|
|
|
(setq desktop-buffer-args-list nil)
|
2009-10-02 03:48:36 +00:00
|
|
|
(when (called-interactively-p 'interactive)
|
2005-01-07 20:18:59 +00:00
|
|
|
(message "Lazy desktop load aborted"))))
|
|
|
|
|
1993-10-07 16:50:26 +00:00
|
|
|
;; ----------------------------------------------------------------------------
|
2004-04-16 12:51:06 +00:00
|
|
|
;; When `desktop-save-mode' is non-nil and "--no-desktop" is not specified on the
|
2003-04-09 01:37:56 +00:00
|
|
|
;; command line, we do the rest of what it takes to use desktop, but do it
|
|
|
|
;; after finishing loading the init file.
|
|
|
|
;; We cannot use `command-switch-alist' to process "--no-desktop" because these
|
|
|
|
;; functions are processed after `after-init-hook'.
|
|
|
|
(add-hook
|
|
|
|
'after-init-hook
|
2007-04-11 02:28:26 +00:00
|
|
|
(lambda ()
|
2003-04-09 01:37:56 +00:00
|
|
|
(let ((key "--no-desktop"))
|
2005-04-18 18:27:39 +00:00
|
|
|
(when (member key command-line-args)
|
|
|
|
(setq command-line-args (delete key command-line-args))
|
2014-02-07 07:44:29 +00:00
|
|
|
(desktop-save-mode 0)))
|
2008-02-12 23:41:19 +00:00
|
|
|
(when desktop-save-mode
|
2016-05-21 19:34:20 +00:00
|
|
|
(desktop-read)
|
|
|
|
(setq inhibit-startup-screen t))))
|
1997-12-29 20:58:19 +00:00
|
|
|
|
1993-06-01 20:11:54 +00:00
|
|
|
(provide 'desktop)
|
1993-06-01 20:09:25 +00:00
|
|
|
|
2000-10-10 16:42:37 +00:00
|
|
|
;;; desktop.el ends here
|