aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKen Manheimer2011-06-30 10:38:35 -0400
committerKen Manheimer2011-06-30 10:38:35 -0400
commit68ba37fbd97f96c75a13609a80fd4c1a5b147e3f (patch)
treefe2b83c142e79e8702a58999d124edac7512566f
parent2e6e11eb3a837d09ac4faa69deb1ba9ba2a98792 (diff)
downloademacs-68ba37fbd97f96c75a13609a80fd4c1a5b147e3f.tar.gz
emacs-68ba37fbd97f96c75a13609a80fd4c1a5b147e3f.zip
* allout.el (allout-yank-processing): Fix injection of extra space between
bullet and non-whitespace character in first topic when pasting, ensuring that the actual spacing in the pasted topic following the bullet char is preserved. This extra space was causing pasted encrypted topics to get a decrypted status even when the content was actually still encrypted. Now the decryption status from before the paste is preserved. (allout-flag-region): Set all allout overlays so they evaporate when reduced to zero length (evanescent), to prevent overlay leakage.
-rw-r--r--lisp/ChangeLog14
-rw-r--r--lisp/allout.el4
2 files changed, 16 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e6cf29a130b..5c063b9603b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,17 @@
12011-06-30 Ken Manheimer <ken.manheimer@gmail.com>
2
3 * allout.el (allout-yank-processing): Fix injection of extra space
4 between bullet and non-whitespace character in first topic when
5 pasting, ensuring that the actual spacing in the pasted topic
6 following the bullet char is preserved. This extra space was
7 causing pasted encrypted topics to get a decrypted status even
8 when the content was actually still encrypted. Now the decryption
9 status from before the paste is preserved.
10
11 (allout-flag-region): Set all allout overlays so they evaporate
12 when reduced to zero length (evanescent), to prevent overlay
13 leakage.
14
12011-06-30 Glenn Morris <rgm@gnu.org> 152011-06-30 Glenn Morris <rgm@gnu.org>
2 16
3 * w32-fns.el (w32-charset-info-alist): Declare. 17 * w32-fns.el (w32-charset-info-alist): Declare.
diff --git a/lisp/allout.el b/lisp/allout.el
index 1d4d4a20e11..552f9461335 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -4605,8 +4605,7 @@ however, are left exactly like normal, non-allout-specific yanks."
4605 ; and delete residual subj 4605 ; and delete residual subj
4606 ; prefix digits and space: 4606 ; prefix digits and space:
4607 (while (looking-at "[0-9]") (delete-char 1)) 4607 (while (looking-at "[0-9]") (delete-char 1))
4608 (if (looking-at " ") 4608 (delete-char -1)))
4609 (delete-char 1))))
4610 ;; Assert new topic's bullet - minimal effort if unchanged: 4609 ;; Assert new topic's bullet - minimal effort if unchanged:
4611 (allout-rebullet-heading (string-to-char prefix-bullet))) 4610 (allout-rebullet-heading (string-to-char prefix-bullet)))
4612 (exchange-point-and-mark)))) 4611 (exchange-point-and-mark))))
@@ -4736,6 +4735,7 @@ arguments as this function, after the exposure changes are made."
4736 (when flag 4735 (when flag
4737 (let ((o (make-overlay from to nil 'front-advance))) 4736 (let ((o (make-overlay from to nil 'front-advance)))
4738 (overlay-put o 'category 'allout-exposure-category) 4737 (overlay-put o 'category 'allout-exposure-category)
4738 (overlay-put o 'evaporate t)
4739 (when (featurep 'xemacs) 4739 (when (featurep 'xemacs)
4740 (let ((props (symbol-plist 'allout-exposure-category))) 4740 (let ((props (symbol-plist 'allout-exposure-category)))
4741 (while props 4741 (while props