mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-20 10:23:57 +00:00
Code Issues Releases Activity
81,826 Commits 225 Branches 190 Tags 541 MiB
aafb0703bf
Commit Graph

171 Commits

Author SHA1 Message Date
Stefan Monnier
116d5bc76a (desktop-create-buffer): Don't catch errors if debug-on-error is set. 2008-03-14 17:08:49 +00:00
Juanma Barranquero
c41cf13074 (desktop-read): Set `desktop-dirname' to nil before running 
`desktop-not-loaded-hook' to allow modifying it.
Don't show warning message if `desktop-dirname' was modified.
 2008-03-01 14:17:41 +00:00
Juanma Barranquero
ae4370a83c (desktop-save): Save the buffer name if the uniquified base name is empty. 2008-02-29 03:03:57 +00:00
Juanma Barranquero
a8049a30d5 (uniquify-managed): Don't defvar. 
(desktop-buffer-info): Use `uniquify-buffer-base-name', not `uniquify-managed'.
Return also the buffer's base name.
(desktop-save): When saving the buffer info, filter out the base name, and save
it as buffer name if the buffer is managed by uniquify.
(uniquify-item-base): Don't declare; not called anymore.
 2008-02-14 14:37:00 +00:00
Juri Linkov
54d22a6f16 (after-init-hook): Set inhibit-startup-screen to t 
after reading the desktop.
 2008-02-12 23:41:19 +00:00
Miles Bader
430d2ee291 Merge from emacs--devo--0 
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-312
 2008-01-09 01:21:15 +00:00
Miles Bader
59ce725a3b Merge from emacs--rel--22 
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-987
 2008-01-08 20:46:54 +00:00
Glenn Morris
409cc4a3ea Add 2008 to copyright years. 2008-01-07 02:45:14 +00:00
Miles Bader
0bd5084171 Merge from emacs--devo--0 
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-294
 2007-12-06 09:51:45 +00:00
Glenn Morris
c3ef64a41e (uniquify-item-base): Declare as a function. 2007-11-30 07:48:32 +00:00
Glenn Morris
70b0a6931a Comment. 2007-11-19 00:06:25 +00:00
Miles Bader
f23d76bdef Merge from emacs--devo--0 
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-283
 2007-11-11 00:56:44 +00:00
Miles Bader
ba69b876ac Merge from emacs--rel--22 
Patches applied:

 * emacs--rel--22  (patch 138-139)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-914
 2007-10-30 23:28:12 +00:00
Michael Olson
f2168a4cda Revert bad erc-track change; ignore erc-track-minor-mode properly in desktop 
* lisp/desktop.el (desktop-minor-mode-table): Add line for ERC.
 2007-10-30 00:50:07 +00:00
Juanma Barranquero
8f3f313d13 (desktop-load-locked-desktop, desktop-base-lock-name, desktop-not-loaded-hook): 
Fix :version tags.
 2007-10-27 17:14:37 +00:00
Juanma Barranquero
93c5a976a0 (uniquify-managed): Pacify byte compiler. 
(desktop-buffer-info): If the buffer name is managed by uniquify,
save the base name, not the uniquified one.
(desktop-create-buffer): Allow `rename-buffer' to generate a new
name in case of conflict.
 2007-10-27 17:11:45 +00:00
Miles Bader
e468b87f91 Merge from emacs--devo--0 
Patches applied:

 * emacs--devo--0  (patch 824-831)

   - Update from CVS
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 70-74)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-238
 2007-07-27 10:52:18 +00:00
Miles Bader
9aecacd08a Merge from emacs--rel--22 
Patches applied:

 * emacs--rel--22  (patch 70-73)

   - Update from CVS

2007-07-25  Glenn Morris  <rgm@gnu.org>

   * Relicense all FSF files to GPLv3 or later.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-828
 2007-07-26 05:28:10 +00:00
Glenn Morris
b4aa60262c Switch license to GPLv3 or later. 2007-07-25 04:50:21 +00:00
Miles Bader
8c406a9bc4 Merge from emacs--devo--0 
Patches applied:

 * emacs--devo--0  (patch 806-813)

   - Merge from emacs--rel--22
   - Update from CVS

 * emacs--rel--22  (patch 51-58)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 233-236)

   - Merge from emacs--devo--0
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-230
 2007-07-15 04:47:46 +00:00
Juanma Barranquero
eca04a35d2 (desktop-buffer-info, desktop-save): Use desktop-dirname' instead of dirname'. 2007-07-12 22:47:51 +00:00
Juanma Barranquero
9e29c91ca3 (desktop-buffer-info, desktop-save): Use desktop-dirname' instead of dirname'. 2007-07-12 22:40:00 +00:00
Miles Bader
1011c48763 Merge from emacs--devo--0 
Patches applied:

 * emacs--devo--0  (patch 803-805)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-227
 2007-07-09 08:00:55 +00:00
Juanma Barranquero
3ae6b03fe6 (desktop-read): Run `desktop-not-loaded-hook' in the directory where the desktop 
file was found, as the docstring says.
(desktop-kill): Use `read-directory-name'.
 (desktop-load-locked-desktop): New option.
(desktop-read): Use it.
(desktop-truncate, desktop-outvar, desktop-restore-file-buffer): Use `when'.
(desktop-save-mode-off): New function.
(desktop-base-lock-name, desktop-not-loaded-hook): New variables.
(desktop-full-lock-name, desktop-file-modtime, desktop-owner,
desktop-claim-lock, desktop-release-lock): New functions.
(desktop-kill): Tell `desktop-save' that this is the last save.
Release the lock afterwards.
(desktop-buffer-info): New function.
(desktop-save): Use it.  Run `desktop-save-hook' where the doc says to.
Detect conflicts, and manage the lock.
(desktop-read): Detect conflicts.  Manage the lock.
 2007-06-24 20:03:06 +00:00
Juanma Barranquero
794855cae2 (desktop-read): Run `desktop-not-loaded-hook' in the directory 
where the desktop file was found, as the docstring says.
(desktop-kill): Use `read-directory-name'.
 2007-06-20 10:12:44 +00:00
Miles Bader
b361539260 Merge from emacs--devo--0 
Patches applied:

 * emacs--devo--0  (patch 793-802)

   - Update from CVS
   - Remove RCS keywords
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 42-50)

   - Update from CVS
   - Merge from gnus--rel--5.10
   - Gnus ChangeLog tweaks

 * gnus--rel--5.10  (patch 229-232)

   - Merge from emacs--devo--0, emacs--rel--22
   - ChangeLog tweak
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-223
 2007-06-16 22:32:13 +00:00
Juanma Barranquero
1f7efe1ba6 (desktop-load-locked-desktop): New option. 
(desktop-read): Use it.
(desktop-truncate, desktop-outvar, desktop-restore-file-buffer): Use `when'.
 2007-06-12 11:14:52 +00:00
Juanma Barranquero
e88110dbfc (desktop-save-mode-off): New function. 
(desktop-base-lock-name, desktop-not-loaded-hook): New variables.
(desktop-full-lock-name, desktop-file-modtime, desktop-owner,
desktop-claim-lock, desktop-release-lock): New functions.
(desktop-kill): Tell `desktop-save' that this is the last save.
Release the lock afterwards.
(desktop-buffer-info): New function.
(desktop-save): Use it.  Run `desktop-save-hook' where the doc says to.
Detect conflicts, and manage the lock.
(desktop-read): Detect conflicts.  Manage the lock.
 2007-06-12 09:11:31 +00:00
Miles Bader
fb9a13e3dc Merge from emacs--devo--0 
Patches applied:

 * emacs--devo--0  (patch 781-792)

   - Update from CVS
   - Merge from gnus--rel--5.10
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 33-41)
 * gnus--rel--5.10  (patch 226-228)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-219
 2007-06-11 00:58:11 +00:00
Juanma Barranquero
b258555dcb (desktop-minor-mode-table): Doc fix. 2007-06-09 00:13:10 +00:00
Juanma Barranquero
7d6ee4dfc6 (desktop-minor-mode-table): Doc fix. 2007-06-09 00:09:03 +00:00
Miles Bader
991a760232 Merge from emacs--devo--0 
Patches applied:

 * emacs--devo--0  (patch 698-710)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 216)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-196
 2007-04-24 21:56:25 +00:00
Stefan Monnier
341c2f07d4 (desktop-save, desktop-create-buffer): Replace mapcar with dolist. 
(after-init-hook): Don't quote lambda.
(desktop-first-buffer): Don't wrap it in eval-when-compile.
(desktop-internal-v2s): Remove unused var `el'.
(desktop-buffer-major-mode, desktop-buffer-locals): Move out of
desktop-restore-file-buffer.
(desktop-buffer-ok-count, desktop-buffer-fail-count): Move out of
desktop-create-buffer.
 2007-04-11 02:28:26 +00:00
Miles Bader
57cb2e6f26 Merge from emacs--devo--0 
Patches applied:

 * emacs--devo--0  (patch 675-697)

   - Update from CVS
   - Merge from gnus--rel--5.10
   - Release ERC 5.2.

 * gnus--rel--5.10  (patch 211-215)

   - Update from CVS
   - Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-189
 2007-04-11 00:17:47 +00:00
Chong Yidong
c5c1022d71 (desktop-create-buffer, desktop-save): Revert 2004-11-12 change. 2007-04-06 18:35:23 +00:00
Miles Bader
70fff7b100 Merge from emacs--devo--0 
Patches applied:

 * emacs--devo--0  (patch 653-661)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 203-206)

   - Merge from emacs--devo--0
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-180
 2007-03-04 06:19:40 +00:00
Lars Hansen
f6218c044c *** empty log message *** 2007-02-28 08:59:40 +00:00
Miles Bader
c0466914ba Merge from emacs--devo--0 
Patches applied:

 * emacs--devo--0  (patch 586-614)

   - Update from CVS
   - Update from erc--emacs--22
   - Merge from gnus--rel--5.10
   - Merge from erc--main--0
   - Make byte compiler correctly write circular constants

 * gnus--rel--5.10  (patch 186-196)

   - Update from CVS
   - Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-162
 2007-01-26 06:16:11 +00:00
Glenn Morris
d7a0267c8d Add 2007 to copyright years. 2007-01-21 03:53:13 +00:00
Miles Bader
863153c57b Merge from emacs--devo--0 
Patches applied:

 * emacs--devo--0  (patch 427-436)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 134-136)

   - Merge from emacs--devo--0
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-110
 2006-09-14 09:24:00 +00:00
Lars Hansen
4cffefee99 Add comment. 2006-09-12 07:13:52 +00:00
David Kastrup
e24f9e5a68 (desktop-read): when loading a desktop, disable 
saving it while the load progresses, and switch off a pending lazy
load by calling `desktop-lazy-abort'.
 2006-09-08 19:47:27 +00:00
Miles Bader
6a46b01883 Merge from emacs--devo--0 
Patches applied:

 * emacs--devo--0  (patch 320-342)

   - Update from CVS
   - Merge from gnus--rel--5.10
   - lisp/play/cookie1.el (cookie): Work properly when there's only one entry
   - Add note about "link" button-class to etc/TODO

 * gnus--rel--5.10  (patch 108-112)

   - Merge from emacs--devo--0
   - Clean up merge mistakes
   - Update from CVS
   - Update from CVS: texi/gnus.texi (Summary Buffer Lines): Fix typo.

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-86
 2006-07-06 08:59:39 +00:00
Lars Hansen
114258349c (desktop-full-file-name): New function. 
(desktop-kill, desktop-save, desktop-remove, desktop-read)
(desktop-revert): Use it.
(desktop-clear, desktop-save, desktop-remove): Add autoload cookie.
(desktop-after-read-hook): Add option list-buffers.
(desktop-locals-to-save): Add tab-width.
(desktop-save-mode, desktop-no-desktop-file-hook, desktop-save-hook):
Fix docstring.
 2006-06-23 21:42:33 +00:00
Miles Bader
4ed925c668 Merge from emacs--devo--0 
Patches applied:

 * emacs--devo--0  (patch 274-284)

   - Update from CVS
   - Update etc/MORE.STUFF.
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 101)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-62
 2006-05-17 07:46:49 +00:00
Lars Hansen
6c27fdb95d (desktop-missing-file-warning): Fix docstring. 
(desktop-restore-file-buffer): Correct question asked on missing file.
 2006-05-14 20:26:37 +00:00
Lars Hansen
9fbcde29a5 (desktop-save): Use with-temp-buffer. 2006-05-13 13:32:10 +00:00
Miles Bader
0b12547529 Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-14 
Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 58-65)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 22-28)

   - Update from CVS
   - Merge from emacs--devo--0
   - Update from CVS: lisp/gnus.el: Remove bogus comment.
 2006-02-11 00:11:19 +00:00
Juanma Barranquero
be617bbf58 (desktop-outvar): Fix typo. 
(desktop-save-buffer-p): Doc fix.
 2006-02-10 11:07:50 +00:00
Miles Bader
380874900c Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-13 
Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 43-57)

   - Update from CVS
   - Merge from erc--emacs--0
   - Make constrain-to-field notice overlays
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 18-21)

   - Update from CVS
   - Merge from emacs--devo--0
 2006-02-08 04:26:44 +00:00