1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-28 19:42:02 +00:00
Commit Graph

303 Commits

Author SHA1 Message Date
Robert Pluim
f21f8e6135 Document 'desktop-files-not-to-save'
* doc/emacs/misc.texi (Saving Emacs Sessions): Add description
of 'desktop-files-not-to-save'.

* lisp/desktop.el (desktop-files-not-to-save): Explain that
the default value excludes buffers visiting remote files.
2018-02-17 13:01:19 +02:00
Paul Eggert
5c7dd8a783 Update copyright year to 2018
Run admin/update-copyright.
2018-01-01 00:57:59 -08:00
Eli Zaretskii
72f813fb56 Fix desktop auto-save timer when linum-mode is used
* lisp/desktop.el (desktop-read): Use toplevel value of
window-configuration-change-hook when deciding whether desktop
auto-saving is enabled.  Suggested by Peter Neidhardt
<pe.neidhardt@googlemail.com>.  (Bug#28945)
2017-11-11 11:53:42 +02:00
Eli Zaretskii
d43b486f6c Fix doc strings in desktop.el
* lisp/desktop.el (desktop-auto-save-timeout)
(desktop-auto-save-set-timer): Doc fixes.  (Bug#28945)
2017-10-28 15:11:08 +03:00
Paul Eggert
3aee7be62e Avoid unnecessary rounding errors in timestamps
Avoid the rounding errors of float-time when it’s easy.  E.g.,
replace (< (float-time a) (float-time b)) with (time-less-p a b).
* lisp/desktop.el (desktop-save):
* lisp/ecomplete.el (ecomplete-add-item):
* lisp/epg.el (epg-wait-for-completion):
* lisp/files.el (dir-locals-find-file, dir-locals-read-from-dir):
* 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-format-time):
* lisp/net/ange-ftp.el (ange-ftp-file-newer-than-file-p)
(ange-ftp-verify-visited-file-modtime):
* lisp/net/rcirc.el (rcirc-ctcp-sender-PING):
* lisp/textmodes/remember.el (remember-store-in-mailbox):
* lisp/url/url-cookie.el (url-cookie-expired-p):
Bypass float-time to avoid rounding errors.

* lisp/files.el (dir-locals-find-file):
2017-10-22 01:07:32 -07:00
Paul Eggert
bc511a64f6 Prefer HTTPS to FTP and HTTP in documentation
Most of this change is to boilerplate commentary such as license URLs.
This change was prompted by ftp://ftp.gnu.org's going-away party,
planned for November.  Change these FTP URLs to https://ftp.gnu.org
instead.  Make similar changes for URLs to other organizations moving
away from FTP.  Also, change HTTP to HTTPS for URLs to gnu.org and
fsf.org when this works, as this will further help defend against
man-in-the-middle attacks (for this part I omitted the MS-DOS and
MS-Windows sources and the test tarballs to keep the workload down).
HTTPS is not fully working to lists.gnu.org so I left those URLs alone
for now.
2017-09-13 15:54:37 -07:00
Mark Oteiza
63b5a4a65e Replace some uses of eval
There are a number of places where eval is used unnecessarily to get
or set the value of a symbol.
* lisp/calendar/calendar.el (diary-date-forms): Use default-value in
custom setter.
* lisp/desktop.el (desktop-clear): Use set-default instead.
* lisp/international/ogonek.el (ogonek-read-encoding): Use
symbol-value.
2017-08-08 15:10:49 -04:00
Noam Postavsky
24f011d56a * lisp/desktop.el (desktop-clear): Skip the daemon's frame (Bug#26912). 2017-06-05 00:08:43 -04:00
Paul Eggert
bcf244ef9b Merge from origin/emacs-25
2e2a806 Fix copyright years by hand
5badc81 Update copyright year to 2017
2017-01-01 01:10:47 -08:00
Paul Eggert
61848d2da3 Merge from origin/emacs-25
697167b ; Improve wording of previous change in variables.texi
d7973e8 Document 'default-toplevel-value' and 'set-default-toplevel-v...
8b71826 Don't modify minibuffer variables globally
5b5e036 Revert to pre-25.1 behavior in ffap
19994a1 * lisp/ffap.el: Fix obsolete comment referencing ffap-bug.
3ace730 Attempt to fix 64-bit AIX build
f69bd79 Clarify usage of 'ediff-cleanup-hook' (Bug#24675)
c04ac8a Document that variable binding order is unspecified
272554a * lisp/desktop.el (desktop-buffers-not-to-save): Doc fix.
08de101 Fix M-x hints on Mac port
86a297a Work around reporting a dpi change in apply_xft_settings
cf1f985 ; lisp/skeleton.el (skeleton-insert): Fix typo in last change
9e1209d Amend the version number of CC Mode 5.33 -> 5.32.99.  Don't m...
88cdf14 Improve skeleton docstrings
2017-01-01 01:02:47 -08:00
Paul Eggert
4f7a90bf6c Merge from origin/emacs-25
9adb101 Document 'describe-fontset'
229315c ; Add missing symbol quoting.
3d94931 Repair desktop restoration on text terminals
43022f9 Ignore forward-sexp-function in js-mode indentation code
b19fb49 Improve documentation of 'define-coding-system'
467768f Fix Bug#25162
6db78ae Fix a typo in define-abbrev-table
5f7d906 Bump makeinfo requirement from 4.7 to 4.13
442e2f6 Fixes related to select-enable-clipboard
e4ac450 Define struct predicate before acccesors
08decbd Doc fix for vc-git
5531e75 Further improve make-dist checking
953bf67 Improve previous make-dist change
129645a Make make-dist --snapshot do some sanity checks

# Conflicts:
#	lisp/menu-bar.el
2017-01-01 01:02:45 -08:00
Paul Eggert
5badc81c1c Update copyright year to 2017
Run admin/update-copyright.
2016-12-31 19:42:26 -08:00
Eli Zaretskii
272554a666 * lisp/desktop.el (desktop-buffers-not-to-save): Doc fix. 2016-12-23 11:36:04 +02:00
Eli Zaretskii
3d94931cec Repair desktop restoration on text terminals
* lisp/desktop.el (desktop-restoring-frameset-p): Test for the GUI
frame here, instead of in desktop-restoring-frameset.  That's
because desktop-read wants to know whether frameset will actually
be restored, and has fallback procedures up its sleeve when it
won't be; these fallbacks need to be invoked when the frameset is
not going to be restored.  (Bug#24298)
2016-12-17 19:05:21 +02:00
Sam Steingold
cd726ef68e Save and restore buffer-display-time
* desktop.el (desktop-locals-to-save): Add `buffer-display-time'
(desktop-read): Set `desktop-file-modtime' before loading the desktop file
(desktop-create-buffer): Adjust `buffer-display-time' for the downtime
2016-10-15 23:14:48 -04:00
Kaushal Modi
03f3287621 Avoid repeated warnings while restoring desktop
* lisp/desktop.el (desktop-restore-file-buffer): Do not print warnings
when files are being opened during desktop restore.
2016-07-22 14:48:12 -04:00
Paul Eggert
845ee57731 Restore frames into the current display by default
* lisp/desktop.el (desktop-restore-in-current-display):
Default to t, not nil (Bug#23604).
* etc/NEWS: Mention the change.
2016-05-29 22:48:01 -07:00
Jun Hao
c9f7ec736b * lisp/desktop.el: Disable restore frameset if in non-graphic display.
Fixes: debbugs:17693
2016-05-21 12:35:45 -07:00
Glenn Morris
0fac75fed1 Improve the custom type of some user options.
* lisp/desktop.el (desktop-minor-mode-table):
* lisp/man.el (Man-frame-parameters):
* lisp/midnight.el (midnight-delay):
* lisp/speedbar.el (speedbar-select-frame-method):
* lisp/tooltip.el (tooltip-frame-parameters):
* lisp/tree-widget.el (tree-widget-space-width):
* lisp/type-break.el (type-break-keystroke-threshold):
* lisp/woman.el (woman-imenu-generic-expression):
* lisp/cedet/ede.el (ede-debug-program-function):
* lisp/cedet/ede/project-am.el (project-am-debug-target-function):
* lisp/emulation/viper-keym.el (viper-toggle-key):
* lisp/erc/erc-networks.el (erc-server-alist):
* lisp/gnus/message.el (message-deletable-headers, message-signature):
* lisp/mail/mailalias.el (mail-directory-stream):
* lisp/play/tetris.el (tetris-x-colors):
* lisp/progmodes/gud.el (gud-tooltip-modes): Improve custom type.
2016-01-30 11:51:10 -08:00
Alan Mackenzie
20defc5538 Desktop: protect users against inadvertant upgrading of desktop file.
An upgraded (version 208) desktop file cannot be read in Emacs < 25.

* etc/NEWS: Add an entry about upgrading a desktop file.

* lisp/desktop.el (desktop-file-version): Amend doc string.
(desktop-native-file-version, desktop-io-file-version): new variables.
(desktop-clear): Set desktop-io-file-version to nil.
(desktop-buffer-info): make the presence of the last item on the list
conditional on (>= desktop-io-file-version 208).
(desktop-save): Add extra parameter VERSION to take user's C-u or C-u C-u.
Amend the doc string.  Add code to determine the output file version.
(desktop-create-buffer): Set desktop-io-file-version to the input file's
version.
2016-01-18 13:32:22 +00:00
Paul Eggert
0e963201d0 Update copyright year to 2016
Run admin/update-copyright.
2016-01-01 01:34:24 -08:00
Paul Eggert
ac16149ba4 Fix docstring quoting problems with ‘ '’
Problem reported by Artur Malabarba in:
http://lists.gnu.org/archive/html/emacs-devel/2015-11/msg01513.html
Most of these fixes are to documentation; many involve fixing
longstanding quoting glitches that are independent of the
recent substitute-command-keys changes.  The changes to code are:
* lisp/cedet/mode-local.el (mode-local-augment-function-help)
(describe-mode-local-overload):
Substitute docstrings before displaying them.
* lisp/emacs-lisp/cl-macs.el (cl--transform-lambda):
Quote the generated docstring for later substitution.
2015-11-17 15:29:35 -08:00
Dmitry Gutov
166a6556d0 ; Remove extraneous "coding: utf-8" specifications in Elisp files 2015-09-29 01:39:46 +03:00
Paul Eggert
c1cacb0994 Avoid hard-coding "M-x command" in docstrings
* lisp/calendar/todo-mode.el (todo-mode):
* lisp/desktop.el (desktop-save-mode):
* lisp/edmacro.el (edit-kbd-macro):
* lisp/emacs-lisp/package.el (package-menu-execute):
* lisp/emulation/viper-cmd.el (viper-ask-level):
* lisp/emulation/viper-init.el (viper-expert-level):
* lisp/filesets.el (filesets-add-buffer):
* lisp/follow.el (follow-mode):
* lisp/gnus/auth-source.el (auth-sources):
* lisp/international/ogonek.el (ogonek-informacja)
(ogonek-information):
* lisp/net/tramp.el (tramp-process-actions):
* lisp/org/org-gnus.el (org-gnus-no-new-news):
* lisp/org/org.el (org-ellipsis):
* lisp/progmodes/python.el (python-shell-get-process-or-error):
* lisp/progmodes/vhdl-mode.el (vhdl-mode):
* lisp/server.el (server-start):
* lisp/type-break.el (type-break-noninteractive-query):
* lisp/userlock.el (ask-user-about-supersession-help):
* lisp/whitespace.el (whitespace-report-region):
Prefer (substitute-command-keys "`\\[foo-command]'")
to "`M-x foo-command'" in docstrings and the like.
2015-08-21 14:09:47 -07:00
Glenn Morris
db87b14e7c * lisp/desktop.el: If modes aren't autoloaded, try simple guesswork.
(desktop-load-file): Guess that "foobar" defines "foobar-mode".
(desktop-buffer-mode-handlers, desktop-minor-mode-handlers):
Doc updates.
(vc-dir-mode): Remove unnecessary autoload.

; Ref: http://debbugs.gnu.org/19226#14
2015-05-25 23:27:55 -07:00
Stefan Monnier
26f8a38497 cl-lib.el: Partial revert of "2015-04-05 Rationalize c[ad]+r"
* lisp/emacs-lisp/cl-lib.el: Partial revert of "2015-04-05 Rationalize
use of c[ad]+r", so as to keep the "cl-" prefix on all
cl-lib definitions.
2015-04-10 01:50:22 -04:00
Alan Mackenzie
2056db3fad Rationalize use of c[ad]+r, expunging cl-c[ad]\{3,4\}r.
Also expunge eudc-c[ad]+r.

* subr.el (internal--compiler-macro-cXXr): "New" function, copied
from cl--compiler-macro-cXXr.
(caar, cadr, cdar, cddr): Change from defsubsts to defuns with
the above compiler-macro.

* net/eudc.el (eudc-cadr, eudc-cdar, eudc-caar, eudc-cdaar): Remove.

* emacs-lisp/cl.el (Top level dolist doing defaliases): Remove
caaar, etc., from list of new alias functions.

* emacs-lisp/cl-lib.el (cl-caaar, etc): Rename to caaar, etc.
(gen-cXXr--rawname, gen-cXXr-all-cl-aliases): New function/macro
which generate obsolete cl- aliases for caaar, etc.  Invoke them.

* desktop.el:
* edmacro.el:
* emacs-lisp/cl-macs.el:
* frameset.el:
* ibuffer.el:
* mail/footnote.el:
* net/dbus.el:
* net/eudc-export.el:
* net/eudc.el:
* net/eudcb-ph.el:
* net/rcirc.el:
* net/secrets.el:
* play/5x5.el:
* play/decipher.el:
* play/hanoi.el:
* progmodes/hideif.el:
* ses.el: Replace cl-caaar, eudc-cadr, etc. with caaar and cadr, etc.
2015-04-05 12:49:14 +00:00
Artur Malabarba
61e06b6cb2 desktop.el (desktop-buffer-info): Use `pushnew'. 2015-03-05 13:43:27 +00:00
Artur Malabarba
6065fbe0d2 desktop.el (desktop-buffer-info): Write docstring. 2015-03-05 13:37:23 +00:00
Kelly Dean
1e00ee2497 desktop.el: Conditionally re-enable desktop autosave
* desktop.el (desktop-read): Conditionally re-enable
desktop autosave. (Bug#19059)
2015-02-17 22:08:51 -02:00
Kelly Dean
c96983efef desktop.el: Save mark-ring less verbosely.
For the discussion, see
https://lists.gnu.org/archive/html/emacs-devel/2015-01/msg00582.html
2015-02-09 13:26:19 +00:00
Ivan Shmakov
e391d88705 Do not clear the session when trying to read a non-existent desktop file.
* lisp/desktop.el (desktop-read): Do not call desktop-clear when no
desktop file is found.

Fixes: debbugs:18371
2015-01-17 19:35:22 +00:00
Paul Eggert
7e09ef09a4 Update copyright year to 2015
Run admin/update-copyright.
2015-01-01 14:26:41 -08:00
Paul Eggert
f9acac751d system-name's returned value can vary
Also, the system-name variable is now obsolete.
Fixes Bug#19438.
* doc/lispref/os.texi (System Environment):
* etc/NEWS: Document this.
* doc/misc/efaq.texi:
(Displaying the current file name in the titlebar):
* lisp/desktop.el (desktop-save-frameset):
* lisp/dnd.el (dnd-get-local-file-uri):
* lisp/gnus/message.el (message-make-fqdn):
* lisp/gnus/nnvirtual.el (nnvirtual-retrieve-headers)
(nnvirtual-update-xref-header):
* lisp/nxml/rng-uri.el (rng-uri-file-name-1):
* lisp/org/org-clock.el (org-clock-save):
* src/filelock.c (current_lock_owner):
* src/xrdb.c (get_environ_db):
* src/xterm.c (same_x_server):
* src/xterm.c (x_term_init):
Prefer (system-name) to system-name, and avoid naming
locals 'system-name'.
* doc/misc/smtpmail.texi (Server workarounds): Fix grammar.
* lisp/startup.el (system-name): Now an obsolete variable.
* src/editfns.c (cached_system_name): New static var.
(init_and_cache_system_name): New function.
(init_editfns, Fsystem_name): Use it.
(syms_of_editfns): Initialize it and Vsystem_name to the same value.
* src/sysdep.c [HAVE_SOCKETS]: Don't include <sys/socket.h>, <netdb.h>.
(h_errno) [TRY_AGAIN && !HAVE_H_ERRNO]: Remove decl.
(init_system_name) [HAVE_SOCKETS]: Don't canonicalize the name.
Don't create a new string if the current value is already correct.
2014-12-29 12:38:58 -08:00
Stefan Monnier
bf642130c1 * lisp/desktop.el (desktop-create-buffer): Use activate-mark to set
`mark-active' (bug#19058).
2014-11-21 13:01:40 -05:00
Ivan Shmakov
2776a6502b * lisp/desktop.el (desktop-create-buffer): Check that buffers are still live
before burying them.

Fixes: debbugs:18373
2014-09-09 20:47:20 -04:00
Glenn Morris
61dcf9bc85 * lisp/desktop.el (after-init-hook): Disable startup frame restoration
in non-graphical situations.

Fixes: debbugs:17693
2014-07-15 21:28:42 -07:00
Juri Linkov
8abe20426b * lisp/desktop.el (desktop-minor-mode-table): Add `defining-kbd-macro'
and `isearch-mode' associated with nil.

Fixes: debbugs:17849
2014-07-04 02:48:24 +03:00
Juri Linkov
cbb6a7aeff * lisp/desktop.el (desktop-save): Rename arg auto-save' to only-if-changed'.
Doc fix.

Fixes: debbugs:17873
2014-07-03 02:45:12 +03:00
Juri Linkov
a4d8b73e1c * lisp/desktop.el (desktop-auto-save-enable)
(desktop-auto-save-disable): New functions.
(desktop-save-mode, desktop-auto-save-timeout): Use them.
(desktop-read): Disable the autosave before loading the desktop,
and enable afterwards.

Fixes: debbugs:17351
2014-06-25 02:23:41 +03:00
Juri Linkov
7f11800984 * lisp/desktop.el: Activate auto-saving on window configuration changes.
(desktop-save-mode, desktop-auto-save-timeout): Add/remove
`desktop-auto-save-set-timer' to/from `window-configuration-change-hook'.
(desktop-auto-save-set-timer): Change REPEAT arg of
`run-with-idle-timer' from t to nil.
http://lists.gnu.org/archive/html/emacs-devel/2014-06/msg00147.html
2014-06-07 02:38:40 +03:00
Juri Linkov
8e554df009 * lisp/desktop.el (desktop-value-to-string): Let-bind print-length' and print-level' to nil.
Fixes: debbugs:17351
2014-04-27 11:22:11 +03:00
Glenn Morris
464560055f Some doc edits related to desktop-restore-frames
* doc/emacs/misc.texi (Saving Emacs Sessions):
Be briefer about desktop's handling of frames.
The manual does not need to mention every option, nor should
it just repeat the doc-strings.

* lisp/desktop.el (desktop-restore-frames)
(desktop-restore-in-current-display, desktop-restore-forces-onscreen)
(desktop-restore-reuses-frames): Doc tweaks.

* etc/NEWS: Related edits.
2014-03-12 00:14:30 -07:00
Juanma Barranquero
4538c058d0 lisp/frameset.el: Separate frame reusing from cleaning up.
* lisp/desktop.el (desktop-restore-forces-onscreen)
  (desktop-restore-reuses-frames): Use non-keyword values.
  (desktop-restore-frameset): Use CLEANUP-FRAMES arg of frameset-restore.

* lisp/frameset.el: Separate options for reusing frames and cleaning up.
  (frameset--reuse-list): Remove definition; declare.
  (frameset--action-map): Declare.
  (frameset--find-frame-if): Doc fix.
  (frameset--restore-frame): Cache frame action.
  (frameset-restore): New keyword arg CLEANUP-FRAMES, allows to select
  how to clean up the frame list after restoring.  Remove cleaning
  options from REUSE-FRAMES.  Change all keyword values to symbols.
  (frameset--jump-to-register): Simplify by using CLEANUP-FRAMES.
2014-03-11 01:46:07 +01:00
Stefan Monnier
ca70fe789c * lisp/desktop.el (desktop-create-buffer): Don't run activate-mark-hook.
Fixes: debbugs:14430
2014-03-09 22:18:29 -04:00
Juanma Barranquero
e59fa9adb3 lisp/desktop.el: Do not fail when desktop-files-not-to-save is nil. 2014-02-22 03:10:49 +01:00
Glenn Morris
c863b6ade6 Some desktop doc
* doc/emacs/misc.texi (Saving Emacs Sessions):
Mention desktop-auto-save-timeout.

* lisp/desktop.el (desktop-save-mode, desktop-auto-save-timeout): Doc fixes.

* etc/NEWS: Related edit.
2014-02-17 17:33:30 -08:00
Juri Linkov
c99cf5eec1 * lisp/desktop.el (desktop-read): Claim the lock when the owner is not the current process.
Fixes: debbugs:16157
2014-02-07 09:58:10 +02:00
Juri Linkov
7d7a68d860 * lisp/desktop.el (desktop-buffers-not-to-save): Change default from nil to "\\` ".
Fixes: debbugs:16651
2014-02-07 09:51:56 +02:00
Juri Linkov
2b777cd9a2 * lisp/desktop.el (desktop-save-mode): Call `desktop-auto-save-set-timer'
when enabling, and `desktop-auto-save-cancel-timer' when disabling.
(desktop-auto-save-cancel-timer): New function with some code from
`desktop-auto-save-set-timer'.
(after-init-hook): Don't call `desktop-auto-save-set-timer'.
Instead of setting `desktop-save-mode' to nil, call
`desktop-save-mode' with arg 0.

Fixes: debbugs:16630
2014-02-07 09:44:29 +02:00