* 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.
* 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.

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 2ab549b..ac6ac7d 100644 (file)
--- 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
similarity index 100%
rename from etc/images/icons/allout-widgets-dark-bg/closed.png
rename to 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
similarity index 100%
rename from etc/images/icons/allout-widgets-dark-bg/closed.xpm
rename to 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
similarity index 100%
rename from etc/images/icons/allout-widgets-dark-bg/empty.png
rename to 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
similarity index 100%
rename from etc/images/icons/allout-widgets-dark-bg/empty.xpm
rename to 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
similarity index 100%
rename from etc/images/icons/allout-widgets-dark-bg/end-connector.png
rename to 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
similarity index 100%
rename from etc/images/icons/allout-widgets-dark-bg/end-connector.xpm
rename to 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
similarity index 100%
rename from etc/images/icons/allout-widgets-dark-bg/extender-connector.png
rename to 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
similarity index 100%
rename from etc/images/icons/allout-widgets-dark-bg/extender-connector.xpm
rename to 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
similarity index 100%
rename from etc/images/icons/allout-widgets-dark-bg/leaf.png
rename to 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
similarity index 100%
rename from etc/images/icons/allout-widgets-dark-bg/leaf.xpm
rename to 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
similarity index 100%
rename from etc/images/icons/allout-widgets-dark-bg/encrypted-locked.png
rename to 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
similarity index 100%
rename from etc/images/icons/allout-widgets-dark-bg/encrypted-locked.xpm
rename to 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
similarity index 100%
rename from etc/images/icons/allout-widgets-dark-bg/mid-connector.png
rename to 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
similarity index 100%
rename from etc/images/icons/allout-widgets-dark-bg/mid-connector.xpm
rename to 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
similarity index 100%
rename from etc/images/icons/allout-widgets-dark-bg/opened.png
rename to 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
similarity index 100%
rename from etc/images/icons/allout-widgets-dark-bg/opened.xpm
rename to 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
similarity index 100%
rename from etc/images/icons/allout-widgets-dark-bg/skip-descender.png
rename to 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
similarity index 100%
rename from etc/images/icons/allout-widgets-dark-bg/skip-descender.xpm
rename to 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
similarity index 100%
rename from etc/images/icons/allout-widgets-dark-bg/through-descender.png
rename to 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
similarity index 100%
rename from etc/images/icons/allout-widgets-dark-bg/through-descender.xpm
rename to 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
similarity index 100%
rename from etc/images/icons/allout-widgets-dark-bg/encrypted-unlocked.png
rename to 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
similarity index 100%
rename from etc/images/icons/allout-widgets-dark-bg/encrypted-unlocked.xpm
rename to 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
similarity index 100%
rename from etc/images/icons/allout-widgets-light-bg/closed.png
rename to 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
similarity index 100%
rename from etc/images/icons/allout-widgets-light-bg/closed.xpm
rename to 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
similarity index 100%
rename from etc/images/icons/allout-widgets-light-bg/empty.png
rename to 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
similarity index 100%
rename from etc/images/icons/allout-widgets-light-bg/empty.xpm
rename to 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
similarity index 100%
rename from etc/images/icons/allout-widgets-light-bg/end-connector.png
rename to 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
similarity index 100%
rename from etc/images/icons/allout-widgets-light-bg/end-connector.xpm
rename to 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
similarity index 100%
rename from etc/images/icons/allout-widgets-light-bg/extender-connector.png
rename to 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
similarity index 100%
rename from etc/images/icons/allout-widgets-light-bg/extender-connector.xpm
rename to 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
similarity index 100%
rename from etc/images/icons/allout-widgets-light-bg/leaf.png
rename to 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
similarity index 100%
rename from etc/images/icons/allout-widgets-light-bg/leaf.xpm
rename to 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
similarity index 100%
rename from etc/images/icons/allout-widgets-light-bg/encrypted-locked.png
rename to 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
similarity index 100%
rename from etc/images/icons/allout-widgets-light-bg/encrypted-locked.xpm
rename to 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
similarity index 100%
rename from etc/images/icons/allout-widgets-light-bg/mid-connector.png
rename to 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
similarity index 100%
rename from etc/images/icons/allout-widgets-light-bg/mid-connector.xpm
rename to 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
similarity index 100%
rename from etc/images/icons/allout-widgets-light-bg/opened.png
rename to 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
similarity index 100%
rename from etc/images/icons/allout-widgets-light-bg/opened.xpm
rename to 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
similarity index 100%
rename from etc/images/icons/allout-widgets-light-bg/skip-descender.png
rename to 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
similarity index 100%
rename from etc/images/icons/allout-widgets-light-bg/skip-descender.xpm
rename to 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
similarity index 100%
rename from etc/images/icons/allout-widgets-light-bg/through-descender.png
rename to 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
similarity index 100%
rename from etc/images/icons/allout-widgets-light-bg/through-descender.xpm
rename to 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
similarity index 100%
rename from etc/images/icons/allout-widgets-light-bg/encrypted-unlocked.png
rename to 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
similarity index 100%
rename from etc/images/icons/allout-widgets-light-bg/encrypted-unlocked.xpm
rename to etc/images/icons/allout-widgets/light-bg/unlocked-encrypted.xpm

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0ff9755..c6b67cc 100644 (file)
--- 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 1d2523f..75e1e58 100644 (file)
--- 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 f77fb0b..4496f9a 100644 (file)
--- 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)