48 files changed, 22 insertions, 9 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 2ab549b4606..ac6ac7df00e 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,11 @@
+2011-02-17  Ken Manheimer  <ken.manheimer@gmail.com>
+
+        * etc/images/icons/allout-widgets/dark-bg,
+        etc/images/icons/allout-widgets/light-bg,
+        encrypted-locked.{xpm,png}, unlocked-encrypted.{xpm,png}:
+        Reorganize icon directories and files to reconcile against windows
+        short-filename clashes.
+
 2011-02-16  Ken Manheimer  <ken.manheimer@gmail.com>
 
         * etc/images/icons/allout-widgets-dark-bg,
diff --git a/etc/images/icons/allout-widgets-dark-bg/closed.png b/etc/images/icons/allout-widgets/dark-bg/closed.png
index b49fd4ad6c9..b49fd4ad6c9 100644
--- a/etc/images/icons/allout-widgets-dark-bg/closed.png
+++ b/etc/images/icons/allout-widgets/dark-bg/closed.png
diff --git a/etc/images/icons/allout-widgets-dark-bg/closed.xpm b/etc/images/icons/allout-widgets/dark-bg/closed.xpm
index 4d7bbebe21c..4d7bbebe21c 100644
--- a/etc/images/icons/allout-widgets-dark-bg/closed.xpm
+++ b/etc/images/icons/allout-widgets/dark-bg/closed.xpm
diff --git a/etc/images/icons/allout-widgets-dark-bg/empty.png b/etc/images/icons/allout-widgets/dark-bg/empty.png
index b9675fdb9ba..b9675fdb9ba 100644
--- a/etc/images/icons/allout-widgets-dark-bg/empty.png
+++ b/etc/images/icons/allout-widgets/dark-bg/empty.png
diff --git a/etc/images/icons/allout-widgets-dark-bg/empty.xpm b/etc/images/icons/allout-widgets/dark-bg/empty.xpm
index e0fc8e5701f..e0fc8e5701f 100644
--- a/etc/images/icons/allout-widgets-dark-bg/empty.xpm
+++ b/etc/images/icons/allout-widgets/dark-bg/empty.xpm
diff --git a/etc/images/icons/allout-widgets-dark-bg/end-connector.png b/etc/images/icons/allout-widgets/dark-bg/end-connector.png
index 696c17ea9a9..696c17ea9a9 100644
--- a/etc/images/icons/allout-widgets-dark-bg/end-connector.png
+++ b/etc/images/icons/allout-widgets/dark-bg/end-connector.png
diff --git a/etc/images/icons/allout-widgets-dark-bg/end-connector.xpm b/etc/images/icons/allout-widgets/dark-bg/end-connector.xpm
index 511d3a4015c..511d3a4015c 100644
--- a/etc/images/icons/allout-widgets-dark-bg/end-connector.xpm
+++ b/etc/images/icons/allout-widgets/dark-bg/end-connector.xpm
diff --git a/etc/images/icons/allout-widgets-dark-bg/extender-connector.png b/etc/images/icons/allout-widgets/dark-bg/extender-connector.png
index 8559f4884d0..8559f4884d0 100644
--- a/etc/images/icons/allout-widgets-dark-bg/extender-connector.png
+++ b/etc/images/icons/allout-widgets/dark-bg/extender-connector.png
diff --git a/etc/images/icons/allout-widgets-dark-bg/extender-connector.xpm b/etc/images/icons/allout-widgets/dark-bg/extender-connector.xpm
index cd9ecc4c5f2..cd9ecc4c5f2 100644
--- a/etc/images/icons/allout-widgets-dark-bg/extender-connector.xpm
+++ b/etc/images/icons/allout-widgets/dark-bg/extender-connector.xpm
diff --git a/etc/images/icons/allout-widgets-dark-bg/leaf.png b/etc/images/icons/allout-widgets/dark-bg/leaf.png
index e2d7b189e84..e2d7b189e84 100644
--- a/etc/images/icons/allout-widgets-dark-bg/leaf.png
+++ b/etc/images/icons/allout-widgets/dark-bg/leaf.png
diff --git a/etc/images/icons/allout-widgets-dark-bg/leaf.xpm b/etc/images/icons/allout-widgets/dark-bg/leaf.xpm
index f25bf40a258..f25bf40a258 100644
--- a/etc/images/icons/allout-widgets-dark-bg/leaf.xpm
+++ b/etc/images/icons/allout-widgets/dark-bg/leaf.xpm
diff --git a/etc/images/icons/allout-widgets-dark-bg/encrypted-locked.png b/etc/images/icons/allout-widgets/dark-bg/locked-encrypted.png
index a6bc3e99a7a..a6bc3e99a7a 100644
--- a/etc/images/icons/allout-widgets-dark-bg/encrypted-locked.png
+++ b/etc/images/icons/allout-widgets/dark-bg/locked-encrypted.png
diff --git a/etc/images/icons/allout-widgets-dark-bg/encrypted-locked.xpm b/etc/images/icons/allout-widgets/dark-bg/locked-encrypted.xpm
index bf7556f2ed9..bf7556f2ed9 100644
--- a/etc/images/icons/allout-widgets-dark-bg/encrypted-locked.xpm
+++ b/etc/images/icons/allout-widgets/dark-bg/locked-encrypted.xpm
diff --git a/etc/images/icons/allout-widgets-dark-bg/mid-connector.png b/etc/images/icons/allout-widgets/dark-bg/mid-connector.png
index 5ad503ed54d..5ad503ed54d 100644
--- a/etc/images/icons/allout-widgets-dark-bg/mid-connector.png
+++ b/etc/images/icons/allout-widgets/dark-bg/mid-connector.png
diff --git a/etc/images/icons/allout-widgets-dark-bg/mid-connector.xpm b/etc/images/icons/allout-widgets/dark-bg/mid-connector.xpm
index b583988a220..b583988a220 100644
--- a/etc/images/icons/allout-widgets-dark-bg/mid-connector.xpm
+++ b/etc/images/icons/allout-widgets/dark-bg/mid-connector.xpm
diff --git a/etc/images/icons/allout-widgets-dark-bg/opened.png b/etc/images/icons/allout-widgets/dark-bg/opened.png
index 5d91d6e8d6d..5d91d6e8d6d 100644
--- a/etc/images/icons/allout-widgets-dark-bg/opened.png
+++ b/etc/images/icons/allout-widgets/dark-bg/opened.png
diff --git a/etc/images/icons/allout-widgets-dark-bg/opened.xpm b/etc/images/icons/allout-widgets/dark-bg/opened.xpm
index e86fd9ecf7e..e86fd9ecf7e 100644
--- a/etc/images/icons/allout-widgets-dark-bg/opened.xpm
+++ b/etc/images/icons/allout-widgets/dark-bg/opened.xpm
diff --git a/etc/images/icons/allout-widgets-dark-bg/skip-descender.png b/etc/images/icons/allout-widgets/dark-bg/skip-descender.png
index 6e3cb00160f..6e3cb00160f 100644
--- a/etc/images/icons/allout-widgets-dark-bg/skip-descender.png
+++ b/etc/images/icons/allout-widgets/dark-bg/skip-descender.png
diff --git a/etc/images/icons/allout-widgets-dark-bg/skip-descender.xpm b/etc/images/icons/allout-widgets/dark-bg/skip-descender.xpm
index 26ae40d57d5..26ae40d57d5 100644
--- a/etc/images/icons/allout-widgets-dark-bg/skip-descender.xpm
+++ b/etc/images/icons/allout-widgets/dark-bg/skip-descender.xpm
diff --git a/etc/images/icons/allout-widgets-dark-bg/through-descender.png b/etc/images/icons/allout-widgets/dark-bg/through-descender.png
index 93410e03340..93410e03340 100644
--- a/etc/images/icons/allout-widgets-dark-bg/through-descender.png
+++ b/etc/images/icons/allout-widgets/dark-bg/through-descender.png
diff --git a/etc/images/icons/allout-widgets-dark-bg/through-descender.xpm b/etc/images/icons/allout-widgets/dark-bg/through-descender.xpm
index 7f375b4fd6c..7f375b4fd6c 100644
--- a/etc/images/icons/allout-widgets-dark-bg/through-descender.xpm
+++ b/etc/images/icons/allout-widgets/dark-bg/through-descender.xpm
diff --git a/etc/images/icons/allout-widgets-dark-bg/encrypted-unlocked.png b/etc/images/icons/allout-widgets/dark-bg/unlocked-encrypted.png
index e70d075690a..e70d075690a 100644
--- a/etc/images/icons/allout-widgets-dark-bg/encrypted-unlocked.png
+++ b/etc/images/icons/allout-widgets/dark-bg/unlocked-encrypted.png
diff --git a/etc/images/icons/allout-widgets-dark-bg/encrypted-unlocked.xpm b/etc/images/icons/allout-widgets/dark-bg/unlocked-encrypted.xpm
index 2baa1e81211..2baa1e81211 100644
--- a/etc/images/icons/allout-widgets-dark-bg/encrypted-unlocked.xpm
+++ b/etc/images/icons/allout-widgets/dark-bg/unlocked-encrypted.xpm
diff --git a/etc/images/icons/allout-widgets-light-bg/closed.png b/etc/images/icons/allout-widgets/light-bg/closed.png
index 591a11adbb0..591a11adbb0 100644
--- a/etc/images/icons/allout-widgets-light-bg/closed.png
+++ b/etc/images/icons/allout-widgets/light-bg/closed.png
diff --git a/etc/images/icons/allout-widgets-light-bg/closed.xpm b/etc/images/icons/allout-widgets/light-bg/closed.xpm
index 20710b42822..20710b42822 100644
--- a/etc/images/icons/allout-widgets-light-bg/closed.xpm
+++ b/etc/images/icons/allout-widgets/light-bg/closed.xpm
diff --git a/etc/images/icons/allout-widgets-light-bg/empty.png b/etc/images/icons/allout-widgets/light-bg/empty.png
index 1c02d26ea41..1c02d26ea41 100644
--- a/etc/images/icons/allout-widgets-light-bg/empty.png
+++ b/etc/images/icons/allout-widgets/light-bg/empty.png
diff --git a/etc/images/icons/allout-widgets-light-bg/empty.xpm b/etc/images/icons/allout-widgets/light-bg/empty.xpm
index 0ed70256f3e..0ed70256f3e 100644
--- a/etc/images/icons/allout-widgets-light-bg/empty.xpm
+++ b/etc/images/icons/allout-widgets/light-bg/empty.xpm
diff --git a/etc/images/icons/allout-widgets-light-bg/end-connector.png b/etc/images/icons/allout-widgets/light-bg/end-connector.png
index b865b40bfeb..b865b40bfeb 100644
--- a/etc/images/icons/allout-widgets-light-bg/end-connector.png
+++ b/etc/images/icons/allout-widgets/light-bg/end-connector.png
diff --git a/etc/images/icons/allout-widgets-light-bg/end-connector.xpm b/etc/images/icons/allout-widgets/light-bg/end-connector.xpm
index 0c9c1c7820d..0c9c1c7820d 100644
--- a/etc/images/icons/allout-widgets-light-bg/end-connector.xpm
+++ b/etc/images/icons/allout-widgets/light-bg/end-connector.xpm
diff --git a/etc/images/icons/allout-widgets-light-bg/extender-connector.png b/etc/images/icons/allout-widgets/light-bg/extender-connector.png
index 4023a456776..4023a456776 100644
--- a/etc/images/icons/allout-widgets-light-bg/extender-connector.png
+++ b/etc/images/icons/allout-widgets/light-bg/extender-connector.png
diff --git a/etc/images/icons/allout-widgets-light-bg/extender-connector.xpm b/etc/images/icons/allout-widgets/light-bg/extender-connector.xpm
index 36ea8f93093..36ea8f93093 100644
--- a/etc/images/icons/allout-widgets-light-bg/extender-connector.xpm
+++ b/etc/images/icons/allout-widgets/light-bg/extender-connector.xpm
diff --git a/etc/images/icons/allout-widgets-light-bg/leaf.png b/etc/images/icons/allout-widgets/light-bg/leaf.png
index e2d7b189e84..e2d7b189e84 100755
--- a/etc/images/icons/allout-widgets-light-bg/leaf.png
+++ b/etc/images/icons/allout-widgets/light-bg/leaf.png
diff --git a/etc/images/icons/allout-widgets-light-bg/leaf.xpm b/etc/images/icons/allout-widgets/light-bg/leaf.xpm
index f25bf40a258..f25bf40a258 100755
--- a/etc/images/icons/allout-widgets-light-bg/leaf.xpm
+++ b/etc/images/icons/allout-widgets/light-bg/leaf.xpm
diff --git a/etc/images/icons/allout-widgets-light-bg/encrypted-locked.png b/etc/images/icons/allout-widgets/light-bg/locked-encrypted.png
index a6bc3e99a7a..a6bc3e99a7a 100755
--- a/etc/images/icons/allout-widgets-light-bg/encrypted-locked.png
+++ b/etc/images/icons/allout-widgets/light-bg/locked-encrypted.png
diff --git a/etc/images/icons/allout-widgets-light-bg/encrypted-locked.xpm b/etc/images/icons/allout-widgets/light-bg/locked-encrypted.xpm
index bf7556f2ed9..bf7556f2ed9 100644
--- a/etc/images/icons/allout-widgets-light-bg/encrypted-locked.xpm
+++ b/etc/images/icons/allout-widgets/light-bg/locked-encrypted.xpm
diff --git a/etc/images/icons/allout-widgets-light-bg/mid-connector.png b/etc/images/icons/allout-widgets/light-bg/mid-connector.png
index 658f340ca80..658f340ca80 100644
--- a/etc/images/icons/allout-widgets-light-bg/mid-connector.png
+++ b/etc/images/icons/allout-widgets/light-bg/mid-connector.png
diff --git a/etc/images/icons/allout-widgets-light-bg/mid-connector.xpm b/etc/images/icons/allout-widgets/light-bg/mid-connector.xpm
index d86f1645c03..d86f1645c03 100644
--- a/etc/images/icons/allout-widgets-light-bg/mid-connector.xpm
+++ b/etc/images/icons/allout-widgets/light-bg/mid-connector.xpm
diff --git a/etc/images/icons/allout-widgets-light-bg/opened.png b/etc/images/icons/allout-widgets/light-bg/opened.png
index 2a77830c175..2a77830c175 100644
--- a/etc/images/icons/allout-widgets-light-bg/opened.png
+++ b/etc/images/icons/allout-widgets/light-bg/opened.png
diff --git a/etc/images/icons/allout-widgets-light-bg/opened.xpm b/etc/images/icons/allout-widgets/light-bg/opened.xpm
index ce3e98fea4b..ce3e98fea4b 100644
--- a/etc/images/icons/allout-widgets-light-bg/opened.xpm
+++ b/etc/images/icons/allout-widgets/light-bg/opened.xpm
diff --git a/etc/images/icons/allout-widgets-light-bg/skip-descender.png b/etc/images/icons/allout-widgets/light-bg/skip-descender.png
index 6e3cb00160f..6e3cb00160f 100644
--- a/etc/images/icons/allout-widgets-light-bg/skip-descender.png
+++ b/etc/images/icons/allout-widgets/light-bg/skip-descender.png
diff --git a/etc/images/icons/allout-widgets-light-bg/skip-descender.xpm b/etc/images/icons/allout-widgets/light-bg/skip-descender.xpm
index 26ae40d57d5..26ae40d57d5 100644
--- a/etc/images/icons/allout-widgets-light-bg/skip-descender.xpm
+++ b/etc/images/icons/allout-widgets/light-bg/skip-descender.xpm
diff --git a/etc/images/icons/allout-widgets-light-bg/through-descender.png b/etc/images/icons/allout-widgets/light-bg/through-descender.png
index bdf08b80193..bdf08b80193 100644
--- a/etc/images/icons/allout-widgets-light-bg/through-descender.png
+++ b/etc/images/icons/allout-widgets/light-bg/through-descender.png
diff --git a/etc/images/icons/allout-widgets-light-bg/through-descender.xpm b/etc/images/icons/allout-widgets/light-bg/through-descender.xpm
index d94c6f675c4..d94c6f675c4 100644
--- a/etc/images/icons/allout-widgets-light-bg/through-descender.xpm
+++ b/etc/images/icons/allout-widgets/light-bg/through-descender.xpm
diff --git a/etc/images/icons/allout-widgets-light-bg/encrypted-unlocked.png b/etc/images/icons/allout-widgets/light-bg/unlocked-encrypted.png
index e70d075690a..e70d075690a 100755
--- a/etc/images/icons/allout-widgets-light-bg/encrypted-unlocked.png
+++ b/etc/images/icons/allout-widgets/light-bg/unlocked-encrypted.png
diff --git a/etc/images/icons/allout-widgets-light-bg/encrypted-unlocked.xpm b/etc/images/icons/allout-widgets/light-bg/unlocked-encrypted.xpm
index 2baa1e81211..2baa1e81211 100644
--- a/etc/images/icons/allout-widgets-light-bg/encrypted-unlocked.xpm
+++ b/etc/images/icons/allout-widgets/light-bg/unlocked-encrypted.xpm
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0ff975592ca..c6b67ccfd73 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2011-02-17  Ken Manheimer  <ken.manheimer@gmail.com>
+
+        * lisp/allout-widgets.el: (allout-widgets-icons-light-subdir)
+        (allout-widgets-icons-dark-subdir): Track relocations of icons
+        * lisp/allout.el: Remove commentary about remove encryption
+        passphrase mnemonic support and verification.
+
 2011-02-17  Deniz Dogan  <deniz.a.m.dogan@gmail.com>
 
         * net/rcirc.el (rcirc-float-time): New function.
diff --git a/lisp/allout-widgets.el b/lisp/allout-widgets.el
index 1d2523f2026..75e1e5882f6 100644
--- a/lisp/allout-widgets.el
+++ b/lisp/allout-widgets.el
@@ -154,12 +154,12 @@ See `allout-widgets-mode' for allout widgets mode features."
 ;; (make-variable-buffer-local 'allout-widgets-allow-unruly-edits)
 ;;;_  = allout-widgets-auto-activation - below, for eval-order dependencies
 ;;;_  = allout-widgets-icons-dark-subdir
-(defcustom allout-widgets-icons-dark-subdir "icons/allout-widgets-dark-bg/"
+(defcustom allout-widgets-icons-dark-subdir "icons/allout-widgets/dark-bg/"
   "Directory on `image-load-path' holding allout icons for dark backgrounds."
   :type 'string
   :group 'allout-widgets)
 ;;;_  = allout-widgets-icons-light-subdir
-(defcustom allout-widgets-icons-light-subdir "icons/allout-widgets-light-bg/"
+(defcustom allout-widgets-icons-light-subdir "icons/allout-widgets/light-bg/"
   "Directory on `image-load-path' holding allout icons for light backgrounds."
   :type 'string
   :group 'allout-widgets)
@@ -1923,8 +1923,8 @@ reapplying this method will rectify the glyphs."
 
         (setq icon-state
               (cond (does-encrypt (if is-encrypted
-                                      'encrypted-locked
-                                    'encrypted-unlocked))
+                                      'locked-encrypted
+                                    'unlocked-encrypted))
                     (expanded 'opened)
                     (has-subitems 'closed)
                     (t 'empty)))
diff --git a/lisp/allout.el b/lisp/allout.el
index f77fb0b47bd..4496f9a9f00 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -39,11 +39,9 @@
 ;;    emacs local file variables need to be enabled when the
 ;;    file was visited -- see `enable-local-variables'.)
 ;;  - Configurable per-file initial exposure settings
-;;  - Symmetric-key and key-pair topic encryption, plus symmetric passphrase
-;;    mnemonic support, with verification against an established passphrase
-;;    (using a stashed encrypted dummy string) and user-supplied hint
-;;    maintenance.  Encryption is via the Emacs 'epg' library.  See
-;;    allout-toggle-current-subtree-encryption docstring.
+;;  - Symmetric-key and key-pair topic encryption.  Encryption is via the
+;;    Emacs 'epg' library.  See allout-toggle-current-subtree-encryption
+;;    docstring.
 ;;  - Automatic topic-number maintenance
 ;;  - "Hot-spot" operation, for single-keystroke maneuvering and
 ;;    exposure control (see the allout-mode docstring)