[Emacs-diffs] /srv/bzr/emacs/trunk r103319: * lisp/allout-widgets.el: (allout-widgets-icons-light-subdir)

[Ken Manheimer]

------------------------------------------------------------
revno: 103319
committer: Ken Manheimer <address@hidden>
branch nick: trunk
timestamp: Thu 2011-02-17 16:47:18 -0500
message:
  * 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.
added:
  etc/images/icons/allout-widgets/
renamed:
  etc/images/icons/allout-widgets-dark-bg/ => 
etc/images/icons/allout-widgets/dark-bg/
  etc/images/icons/allout-widgets-dark-bg/encrypted-locked.png => 
etc/images/icons/allout-widgets/dark-bg/locked-encrypted.png
  etc/images/icons/allout-widgets-dark-bg/encrypted-locked.xpm => 
etc/images/icons/allout-widgets/dark-bg/locked-encrypted.xpm
  etc/images/icons/allout-widgets-dark-bg/encrypted-unlocked.png => 
etc/images/icons/allout-widgets/dark-bg/unlocked-encrypted.png
  etc/images/icons/allout-widgets-dark-bg/encrypted-unlocked.xpm => 
etc/images/icons/allout-widgets/dark-bg/unlocked-encrypted.xpm
  etc/images/icons/allout-widgets-light-bg/ => 
etc/images/icons/allout-widgets/light-bg/
  etc/images/icons/allout-widgets-light-bg/encrypted-locked.png => 
etc/images/icons/allout-widgets/light-bg/locked-encrypted.png
  etc/images/icons/allout-widgets-light-bg/encrypted-locked.xpm => 
etc/images/icons/allout-widgets/light-bg/locked-encrypted.xpm
  etc/images/icons/allout-widgets-light-bg/encrypted-unlocked.png => 
etc/images/icons/allout-widgets/light-bg/unlocked-encrypted.png
  etc/images/icons/allout-widgets-light-bg/encrypted-unlocked.xpm => 
etc/images/icons/allout-widgets/light-bg/unlocked-encrypted.xpm
modified:
  etc/ChangeLog
  lisp/ChangeLog
  lisp/allout-widgets.el
  lisp/allout.el

=== modified file 'etc/ChangeLog'
--- a/etc/ChangeLog     2011-02-16 22:10:43 +0000
+++ b/etc/ChangeLog     2011-02-17 21:47:18 +0000
@@ -1,3 +1,11 @@
+2011-02-17  Ken Manheimer  <address@hidden>
+
+       * 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  <address@hidden>
 
        * etc/images/icons/allout-widgets-dark-bg,

=== added directory 'etc/images/icons/allout-widgets'
=== renamed directory 'etc/images/icons/allout-widgets-dark-bg' => 
'etc/images/icons/allout-widgets/dark-bg'
=== renamed file 'etc/images/icons/allout-widgets-dark-bg/encrypted-locked.png' 
=> 'etc/images/icons/allout-widgets/dark-bg/locked-encrypted.png'
=== renamed file 'etc/images/icons/allout-widgets-dark-bg/encrypted-locked.xpm' 
=> 'etc/images/icons/allout-widgets/dark-bg/locked-encrypted.xpm'
=== renamed file 
'etc/images/icons/allout-widgets-dark-bg/encrypted-unlocked.png' => 
'etc/images/icons/allout-widgets/dark-bg/unlocked-encrypted.png'
=== renamed file 
'etc/images/icons/allout-widgets-dark-bg/encrypted-unlocked.xpm' => 
'etc/images/icons/allout-widgets/dark-bg/unlocked-encrypted.xpm'
=== renamed directory 'etc/images/icons/allout-widgets-light-bg' => 
'etc/images/icons/allout-widgets/light-bg'
=== renamed file 
'etc/images/icons/allout-widgets-light-bg/encrypted-locked.png' => 
'etc/images/icons/allout-widgets/light-bg/locked-encrypted.png'
=== renamed file 
'etc/images/icons/allout-widgets-light-bg/encrypted-locked.xpm' => 
'etc/images/icons/allout-widgets/light-bg/locked-encrypted.xpm'
=== renamed file 
'etc/images/icons/allout-widgets-light-bg/encrypted-unlocked.png' => 
'etc/images/icons/allout-widgets/light-bg/unlocked-encrypted.png'
=== renamed file 
'etc/images/icons/allout-widgets-light-bg/encrypted-unlocked.xpm' => 
'etc/images/icons/allout-widgets/light-bg/unlocked-encrypted.xpm'
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-02-17 11:41:49 +0000
+++ b/lisp/ChangeLog    2011-02-17 21:47:18 +0000
@@ -1,3 +1,10 @@
+2011-02-17  Ken Manheimer  <address@hidden>
+
+       * 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  <address@hidden>
 
        * net/rcirc.el (rcirc-float-time): New function.

=== modified file 'lisp/allout-widgets.el'
--- a/lisp/allout-widgets.el    2011-02-16 22:10:43 +0000
+++ b/lisp/allout-widgets.el    2011-02-17 21:47:18 +0000
@@ -154,12 +154,12 @@
 ;; (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 @@
 
         (setq icon-state
               (cond (does-encrypt (if is-encrypted
-                                      'encrypted-locked
-                                    'encrypted-unlocked))
+                                      'locked-encrypted
+                                    'unlocked-encrypted))
                     (expanded 'opened)
                     (has-subitems 'closed)
                     (t 'empty)))

=== modified file 'lisp/allout.el'
--- a/lisp/allout.el    2011-02-16 21:29:32 +0000
+++ b/lisp/allout.el    2011-02-17 21:47:18 +0000
@@ -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)