Mercurial > emacs
annotate lisp/emacs-lock.el @ 111789:f97704487fb3
Merge changes made in Gnus trunk.
nnir.el: Batch header retrieval.
proto-stream.el: New library to provide protocol-specific TLS/STARTTLS connections for IMAP, NNTP, SMTP, POP3 and similar protocols.
nnimap.el (nnimap-open-connection): Use it.
proto-stream.el (open-proto-stream): Complete the documentation.
nnimap.el (nnimap-open-connection): Check for "OK" from the greeting.
nntp.el: Use proto-streams for the relevant connections types.
nntp.el (nntp-open-connection): Switch on STARTTLS on supported servers.
proto-stream.el (open-proto-stream): Add a way to specify what the end of a command is.
proto-stream.el (proto-stream-open-tls): Delete output from openssl if we're using tls.el.
proto-stream.el (proto-stream-open-network): If we don't have gnutls-cli or gnutls built in, then don't try to establish a STARTTLS connection.
color.el (color-lab->srgb): Fix function call name.
proto-stream.el: Fix the syntax in the comment.
nntp.el (nntp-open-connection): Fix the STARTTLS command syntax.
proto-stream.el (proto-stream-open-starttls): Actually implement the starttls.el STARTTLS.
proto-stream.el (proto-stream-always-use-starttls): New variable.
proto-stream.el (proto-stream-open-starttls): De-duplicate the starttls code.
proto-stream.el (proto-stream-open-starttls): Folded back into the main function.
proto-stream.el (proto-stream-command): Refactor out.
nnimap.el (nnimap-stream): Change default to `undecided'.
nnimap.el (nnimap-open-connection): If `nnimap-stream' is `undecided', try ssl first, and then network.
nnimap.el (nnimap-open-connection-1): Respect nnimap-server-port.
nnimap.el (nnimap-open-connection): Be more backwards-compatible.
proto-stream.el (open-protocol-stream): Renamed from open-proto-stream.
proto-stream.el (proto-stream-open-network): When doing opportunistic TLS upgrades we don't really care about the identity of the peer.
gnus.texi (Customizing the IMAP Connection): Note the new defaults.
gnus.texi (Direct Functions): Note the STARTTLS upgrade.
proto-stream.el (proto-stream-open-network): Force starttls.el to use gnutls-cli, since that what we've checked for.
proto-stream.el (proto-stream-always-use-starttls): Only default to t if open-gnutls-stream exists.
proto-stream.el (proto-stream-open-network): If STARTTLS failed, then just open a normal connection.
proto-stream.el (proto-stream-open-network): Wait until the greeting before doing STARTTLS.
nnimap.el (nnimap-open-connection-1): Always upgrade to STARTTLS (for backwards compatibility).
nnimap.el (nnimap-open-connection-1): Really respect nnimap-server-port.
nntp.el (nntp-open-connection): Provide a :success condition.
nnimap.el (nnimap-open-connection-1): Ditto.
proto-stream.el (proto-stream-open-network): See what the response to the STARTTLS command is.
proto-stream.el (proto-stream-open-network): Add some comments.
proto-stream.el: Fix example.
proto-stream.el (open-protocol-stream): Actually mention the STARTTLS upgrade.
nnir.el (nnir-get-active): Skip nnir-ignored-newsgroups when searching.
nnir.el (nnir-ignore-newsgroups): Fix default value.
nnir.el (nnir-run-gmane): Use mm-delete-duplicates instead of delete-dups that is not available in XEmacs 21.4.
mm-util.el (mm-delete-duplicates): Add comment.
gnus-sum.el (gnus-summary-delete-article): If delete fails don't change the registry.
nnimap.el (nnimap-open-connection-1): w32 open-network-stream doesn't seem to accept strings-with-numbers as port numbers.
color.el: fix docstring to use English rather than math notation for intervals.
shr.el (shr-find-fill-point): Don't break before apostrophes.
nnir.el (nnir-request-move-article): Bail out if no move support in group.
color.el (color-rgb->hsv): Fix docstring.
nnir.el (nnir-get-active): Improve active list retrieval.
shr.el (shr-find-fill-point): Work better for kinsoku chars and apostrophes.
gnus-gravatar.el (gnus-gravatar-size): Set gnus-gravatar-size to nil.
nnimap.el (nnimap-open-connection-1): Use gnus-string-match-p.
nnimap.el (nnimap-open-connection-1): Fix PREAUTH.
proto-stream.el (open-protocol-stream): All starttls connections are handled by the network handler.
gnus-gravatar.el (gnus-gravatar-insert): Delete unnecessary binding to t of inhibit-read-only since it is inside gnus-with-article-headers.
gnus-gravatar.el (gnus-gravatar-transform-address): Use mail-extract-address-components that supports non-ASCII names rather than mail-header-parse-addresses.
shr.el (shr-find-fill-point): Don't break line between kinsoku-bol characters.
gnus-gravatar.el (gnus-gravatar-insert): Allow LWSP in the middle of names.
nnmaildir.el (nnmaildir-request-set-mark): Add article to add-mark funcall.
gnus-msg.el: Remove nastygram thing.
message.el (message-from-style): Fix comment.
message.el (message-user-organization): Do not use gnus-local-organization.
gnus.el: Remove gnus-local-organization.
rtree.el: New file to handle range trees.
nnir.el, gnus-sum.el: Redo the way nnir handles registry updates.
rtree.el (rtree-extract): Simplify.
gnus-win.el (gnus-configure-windows): Remove Gnus 3.x setting support.
gnus-msg.el: Mark gnus-outgoing-message-group as obsolete.
gnus.texi (Archived Messages): Remove gnus-outgoing-message-group.
gnus-win.el (gnus-configure-frame): Remove old compatibility code.
rtree.el (rtree-memq): Rewrite it as a non-recursive function.
rtree.el (rtree-add, rtree-delq, rtree-length): Implement.
rtree.el (rtree-add): Make code slightly faster.
nnir.el: Allow modified summary-line-format in nnir summary buffers.
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Thu, 02 Dec 2010 22:21:31 +0000 |
parents | 1d1d5d9bd884 |
children | 376148b31b5e |
rev | line source |
---|---|
74249
13b7163b7bff
(toggle-emacs-lock): Doc fix. Simplify.
Juanma Barranquero <lekktu@gmail.com>
parents:
73761
diff
changeset
|
1 ;;; emacs-lock.el --- prevents you from exiting Emacs if a buffer is locked |
14169 | 2 |
74439 | 3 ;; Copyright (C) 1994, 1997, 2001, 2002, 2003, 2004, |
106815 | 4 ;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc |
14169 | 5 |
10240 | 6 ;; Author: Tom Wurgler <twurgler@goodyear.com> |
7 ;; Created: 12/8/94 | |
18214 | 8 ;; Keywords: extensions, processes |
14169 | 9 |
10 ;; This file is part of GNU Emacs. | |
11 | |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
12 ;; GNU Emacs is free software: you can redistribute it and/or modify |
10240 | 13 ;; it under the terms of the GNU General Public License as published by |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
14 ;; the Free Software Foundation, either version 3 of the License, or |
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
15 ;; (at your option) any later version. |
14169 | 16 |
17 ;; GNU Emacs is distributed in the hope that it will be useful, | |
10240 | 18 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of |
19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
20 ;; GNU General Public License for more details. | |
14169 | 21 |
10240 | 22 ;; You should have received a copy of the GNU General Public License |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
23 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
10240 | 24 |
25 ;;; Commentary: | |
14169 | 26 |
10240 | 27 ;; This code sets a buffer-local variable to t if toggle-emacs-lock is run, |
74249
13b7163b7bff
(toggle-emacs-lock): Doc fix. Simplify.
Juanma Barranquero <lekktu@gmail.com>
parents:
73761
diff
changeset
|
28 ;; then if the user attempts to exit Emacs, the locked buffer name will be |
10240 | 29 ;; displayed and the exit aborted. This is just a way of protecting |
30 ;; yourself from yourself. For example, if you have a shell running a big | |
74249
13b7163b7bff
(toggle-emacs-lock): Doc fix. Simplify.
Juanma Barranquero <lekktu@gmail.com>
parents:
73761
diff
changeset
|
31 ;; program and exiting Emacs would abort that program, you may want to lock |
10240 | 32 ;; that buffer, then if you forget about it after a while, you won't |
74249
13b7163b7bff
(toggle-emacs-lock): Doc fix. Simplify.
Juanma Barranquero <lekktu@gmail.com>
parents:
73761
diff
changeset
|
33 ;; accidentally exit Emacs. To unlock the buffer, just goto the buffer and |
10240 | 34 ;; run toggle-emacs-lock again. |
35 | |
14169 | 36 ;;; Code: |
37 | |
18207
3b7e375756d2
Added the string "emacs-lock" to all function
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
38 (defvar emacs-lock-from-exiting nil |
73761
7d7c934f1c8f
(emacs-lock-from-exiting): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
68651
diff
changeset
|
39 "Whether Emacs is locked to prevent exiting. See `check-emacs-lock'.") |
18207
3b7e375756d2
Added the string "emacs-lock" to all function
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
40 (make-variable-buffer-local 'emacs-lock-from-exiting) |
3b7e375756d2
Added the string "emacs-lock" to all function
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
41 |
3b7e375756d2
Added the string "emacs-lock" to all function
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
42 (defvar emacs-lock-buffer-locked nil |
3b7e375756d2
Added the string "emacs-lock" to all function
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
43 "Whether a shell or telnet buffer was locked when its process was killed.") |
3b7e375756d2
Added the string "emacs-lock" to all function
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
44 (make-variable-buffer-local 'emacs-lock-buffer-locked) |
3b7e375756d2
Added the string "emacs-lock" to all function
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
45 (put 'emacs-lock-buffer-locked 'permanent-local t) |
10240 | 46 |
47 (defun check-emacs-lock () | |
18207
3b7e375756d2
Added the string "emacs-lock" to all function
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
48 "Check if variable `emacs-lock-from-exiting' is t for any buffer. |
74249
13b7163b7bff
(toggle-emacs-lock): Doc fix. Simplify.
Juanma Barranquero <lekktu@gmail.com>
parents:
73761
diff
changeset
|
49 If any locked buffer is found, signal error and display the buffer's name." |
13b7163b7bff
(toggle-emacs-lock): Doc fix. Simplify.
Juanma Barranquero <lekktu@gmail.com>
parents:
73761
diff
changeset
|
50 (save-excursion |
13b7163b7bff
(toggle-emacs-lock): Doc fix. Simplify.
Juanma Barranquero <lekktu@gmail.com>
parents:
73761
diff
changeset
|
51 (dolist (buffer (buffer-list)) |
13b7163b7bff
(toggle-emacs-lock): Doc fix. Simplify.
Juanma Barranquero <lekktu@gmail.com>
parents:
73761
diff
changeset
|
52 (set-buffer buffer) |
13b7163b7bff
(toggle-emacs-lock): Doc fix. Simplify.
Juanma Barranquero <lekktu@gmail.com>
parents:
73761
diff
changeset
|
53 (when emacs-lock-from-exiting |
13b7163b7bff
(toggle-emacs-lock): Doc fix. Simplify.
Juanma Barranquero <lekktu@gmail.com>
parents:
73761
diff
changeset
|
54 (error "Emacs is locked from exit due to buffer: %s" (buffer-name)))))) |
10240 | 55 |
56 (defun toggle-emacs-lock () | |
74249
13b7163b7bff
(toggle-emacs-lock): Doc fix. Simplify.
Juanma Barranquero <lekktu@gmail.com>
parents:
73761
diff
changeset
|
57 "Toggle `emacs-lock-from-exiting' for the current buffer. |
10240 | 58 See `check-emacs-lock'." |
59 (interactive) | |
74249
13b7163b7bff
(toggle-emacs-lock): Doc fix. Simplify.
Juanma Barranquero <lekktu@gmail.com>
parents:
73761
diff
changeset
|
60 (setq emacs-lock-from-exiting (not emacs-lock-from-exiting)) |
18207
3b7e375756d2
Added the string "emacs-lock" to all function
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
61 (if emacs-lock-from-exiting |
3b7e375756d2
Added the string "emacs-lock" to all function
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
62 (message "Buffer is now locked") |
3b7e375756d2
Added the string "emacs-lock" to all function
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
63 (message "Buffer is now unlocked"))) |
3b7e375756d2
Added the string "emacs-lock" to all function
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
64 |
3b7e375756d2
Added the string "emacs-lock" to all function
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
65 (defun emacs-lock-check-buffer-lock () |
3b7e375756d2
Added the string "emacs-lock" to all function
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
66 "Check if variable `emacs-lock-from-exiting' is t for a buffer. |
74249
13b7163b7bff
(toggle-emacs-lock): Doc fix. Simplify.
Juanma Barranquero <lekktu@gmail.com>
parents:
73761
diff
changeset
|
67 If the buffer is locked, signal error and display its name." |
13b7163b7bff
(toggle-emacs-lock): Doc fix. Simplify.
Juanma Barranquero <lekktu@gmail.com>
parents:
73761
diff
changeset
|
68 (when emacs-lock-from-exiting |
13b7163b7bff
(toggle-emacs-lock): Doc fix. Simplify.
Juanma Barranquero <lekktu@gmail.com>
parents:
73761
diff
changeset
|
69 (error "Buffer `%s' is locked, can't delete it" (buffer-name)))) |
18207
3b7e375756d2
Added the string "emacs-lock" to all function
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
70 |
3b7e375756d2
Added the string "emacs-lock" to all function
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
71 ; These next defuns make it so if you exit a shell that is locked, the lock |
74249
13b7163b7bff
(toggle-emacs-lock): Doc fix. Simplify.
Juanma Barranquero <lekktu@gmail.com>
parents:
73761
diff
changeset
|
72 ; is shut off for that shell so you can exit Emacs. Same for telnet. |
18207
3b7e375756d2
Added the string "emacs-lock" to all function
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
73 ; Also, if a shell or a telnet buffer was locked and the process killed, |
3b7e375756d2
Added the string "emacs-lock" to all function
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
74 ; turn the lock back on again if the process is restarted. |
3b7e375756d2
Added the string "emacs-lock" to all function
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
75 |
3b7e375756d2
Added the string "emacs-lock" to all function
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
76 (defun emacs-lock-shell-sentinel () |
3b7e375756d2
Added the string "emacs-lock" to all function
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
77 (set-process-sentinel |
3b7e375756d2
Added the string "emacs-lock" to all function
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
78 (get-buffer-process (buffer-name)) (function emacs-lock-clear-sentinel))) |
3b7e375756d2
Added the string "emacs-lock" to all function
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
79 |
3b7e375756d2
Added the string "emacs-lock" to all function
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
80 (defun emacs-lock-clear-sentinel (proc str) |
3b7e375756d2
Added the string "emacs-lock" to all function
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
81 (if emacs-lock-from-exiting |
3b7e375756d2
Added the string "emacs-lock" to all function
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
82 (progn |
18211 | 83 (setq emacs-lock-from-exiting nil) |
18207
3b7e375756d2
Added the string "emacs-lock" to all function
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
84 (setq emacs-lock-buffer-locked t) |
3b7e375756d2
Added the string "emacs-lock" to all function
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
85 (message "Buffer is now unlocked")) |
3b7e375756d2
Added the string "emacs-lock" to all function
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
86 (setq emacs-lock-buffer-locked nil))) |
3b7e375756d2
Added the string "emacs-lock" to all function
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
87 |
3b7e375756d2
Added the string "emacs-lock" to all function
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
88 (defun emacs-lock-was-buffer-locked () |
3b7e375756d2
Added the string "emacs-lock" to all function
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
89 (if emacs-lock-buffer-locked |
3b7e375756d2
Added the string "emacs-lock" to all function
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
90 (setq emacs-lock-from-exiting t))) |
10240 | 91 |
92 (add-hook 'kill-emacs-hook 'check-emacs-lock) | |
18207
3b7e375756d2
Added the string "emacs-lock" to all function
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
93 (add-hook 'kill-buffer-hook 'emacs-lock-check-buffer-lock) |
3b7e375756d2
Added the string "emacs-lock" to all function
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
94 (add-hook 'shell-mode-hook 'emacs-lock-was-buffer-locked) |
3b7e375756d2
Added the string "emacs-lock" to all function
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
95 (add-hook 'shell-mode-hook 'emacs-lock-shell-sentinel) |
3b7e375756d2
Added the string "emacs-lock" to all function
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
96 (add-hook 'telnet-mode-hook 'emacs-lock-was-buffer-locked) |
3b7e375756d2
Added the string "emacs-lock" to all function
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
97 (add-hook 'telnet-mode-hook 'emacs-lock-shell-sentinel) |
10240 | 98 |
18207
3b7e375756d2
Added the string "emacs-lock" to all function
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
99 (provide 'emacs-lock) |
3b7e375756d2
Added the string "emacs-lock" to all function
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
100 |
93975
1e3a407766b9
Fix up comment convention on the arch-tag lines.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
79721
diff
changeset
|
101 ;; arch-tag: 58e6cb43-7cf0-401a-bcb6-4902a0b8bdc1 |
18207
3b7e375756d2
Added the string "emacs-lock" to all function
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
102 ;;; emacs-lock.el ends here |