Changeset 4073 for trunk/lisp/allout.el

Timestamp:

05/03/06 18:37:43 (3 years ago)

Author:

miyoshi

Message:

Sync up with Emacs CVS HEAD.

Files:

• trunk (modified) (1 prop)
• trunk/lisp/allout.el (modified) (26 diffs)

trunk/lisp/allout.el

@@ -85 +85 @@
-                          (require 'overlay)
-                          ))
-(autoload 'pgg-gpg-symmetric-key-p "pgg-gpg"
-  "True if decoded armor MESSAGE-KEYS has symmetric encryption indicator.")
-
-;;;_* USER CUSTOMIZATION VARIABLES:
@@ -200 +198 @@
-  :group 'allout)
-(make-variable-buffer-local 'allout-show-bodies)
+;;;###autoload
+(put 'allout-show-bodies 'safe-local-variable
+     (lambda (x) (member x '(t nil))))
-
-;;;_  = allout-header-prefix
@@ -213 +214 @@
-  :group 'allout)
-(make-variable-buffer-local 'allout-header-prefix)
+;;;###autoload
+(put 'allout-header-prefix 'safe-local-variable 'stringp)
-;;;_  = allout-primary-bullet
-(defcustom allout-primary-bullet "*"
@@ -228 +231 @@
-  :group 'allout)
-(make-variable-buffer-local 'allout-primary-bullet)
+;;;###autoload
+(put 'allout-primary-bullet 'safe-local-variable 'stringp)
-;;;_  = allout-plain-bullets-string
-(defcustom allout-plain-bullets-string ".,"
@@ -242 +247 @@
-  :group 'allout)
-(make-variable-buffer-local 'allout-plain-bullets-string)
+;;;###autoload
+(put 'allout-plain-bullets-string 'safe-local-variable 'stringp)
-;;;_  = allout-distinctive-bullets-string
-(defcustom allout-distinctive-bullets-string "*+-=>()[{}&!?#%\"X@$~_\\:;^"
@@ -275 +282 @@
-  :group 'allout)
-(make-variable-buffer-local 'allout-distinctive-bullets-string)
+;;;###autoload
+(put 'allout-distinctive-bullets-string 'safe-local-variable 'stringp)
-
-;;;_  = allout-use-mode-specific-leader
@@ -306 +315 @@
-                 (const comment-start))
-  :group 'allout)
+;;;###autoload
+(put 'allout-use-mode-specific-leader 'safe-local-variable
+     (lambda (x) (or (member x '(t nil)) (stringp x))))
-;;;_  = allout-mode-leaders
-(defvar allout-mode-leaders '()
@@ -331 +343 @@
-  :group 'allout)
-(make-variable-buffer-local 'allout-old-style-prefixes)
+;;;###autoload
+(put 'allout-old-style-prefixes 'safe-local-variable
+     (lambda (x) (member x '(t nil))))
-;;;_  = allout-stylish-prefixes - alternating bullets
-(defcustom allout-stylish-prefixes t
@@ -377 +392 @@
-  :group 'allout)
-(make-variable-buffer-local 'allout-stylish-prefixes)
+;;;###autoload
+(put 'allout-stylish-prefixes 'safe-local-variable
+     (lambda (x) (member x '(t nil))))
-
-;;;_  = allout-numbered-bullet
@@ -389 +407 @@
-  :group 'allout)
-(make-variable-buffer-local 'allout-numbered-bullet)
+;;;###autoload
+(put 'allout-numbered-bullet 'safe-local-variable
+     (lambda (x) (or (not x) (stringp x))))
-;;;_  = allout-file-xref-bullet
-(defcustom allout-file-xref-bullet "@"
@@ -396 +417 @@
-  :type '(choice (const nil) string)
-  :group 'allout)
+;;;###autoload
+(put 'allout-file-xref-bullet 'safe-local-variable
+     (lambda (x) (or (not x) (stringp x))))
-;;;_  = allout-presentation-padding
-(defcustom allout-presentation-padding 2
@@ -403 +427 @@
-
-(make-variable-buffer-local 'allout-presentation-padding)
+;;;###autoload
+(put 'allout-presentation-padding 'safe-local-variable 'integerp)
-
-;;;_  = allout-abbreviate-flattened-numbering
@@ -456 +482 @@
-
-;;;_ + Topic encryption
+;;;_  = allout-encryption group
+(defgroup allout-encryption nil
+  "Settings for topic encryption features of allout outliner."
+  :group 'allout)
-;;;_  = allout-topic-encryption-bullet
-(defcustom allout-topic-encryption-bullet "~"
-  "*Bullet signifying encryption of the entry's body."
-  :type '(choice (const nil) string)
-
+
+
-;;;_  = allout-passphrase-verifier-handling
-(defcustom allout-passphrase-verifier-handling t
@@ -468 +499 @@
-variable for details about allout ajustment of file variables."
-  :type 'boolean
-
+
+
-(make-variable-buffer-local 'allout-passphrase-verifier-handling)
-;;;_  = allout-passphrase-hint-handling
@@ -483 +515 @@
-                 (const needed)
-                 (const disabled))
-
+
+
-(make-variable-buffer-local 'allout-passphrase-hint-handling)
-;;;_  = allout-encrypt-unencrypted-on-saves
@@ -515 +548 @@
-                 (const :tag "All except current topic" except-current)
-                 (const :tag "No" nil))
-
+
+
-(make-variable-buffer-local 'allout-encrypt-unencrypted-on-saves)
-
@@ -586 +620 @@
-  :group 'allout)
-(make-variable-buffer-local 'allout-use-hanging-indents)
+;;;###autoload
+(put 'allout-use-hanging-indents 'safe-local-variable
+     (lambda (x) (member x '(t nil))))
-
-;;;_  = allout-reindent-bodies
@@ -603 +640 @@
-
-(make-variable-buffer-local 'allout-reindent-bodies)
+;;;###autoload
+(put 'allout-reindent-bodies 'safe-local-variable
+     (lambda (x) (member x '(nil t text force))))
-
-;;;_  = allout-enable-file-variable-adjustment
@@ -668 +708 @@
-(make-variable-buffer-local 'allout-layout)
-;;;###autoload
-
+
+
+
-
-;;;_  : Topic header format
@@ -1054 +1096 @@
-`allout-enable-file-variable-adjustment' for details about that.")
-(make-variable-buffer-local 'allout-passphrase-verifier-string)
-
+
+
-;;;_   = allout-passphrase-hint-string
-(defvar allout-passphrase-hint-string ""
@@ -1066 +1109 @@
-`allout-enable-file-variable-adjustment' for details about that.")
-(make-variable-buffer-local 'allout-passphrase-hint-string)
-(put 'allout-passphrase-hint-string 'safe-local-variable t)
-(setq-default allout-passphrase-hint-string "")
+;;;###autoload
+(put 'allout-passphrase-hint-string 'safe-local-variable 'stringp)
-;;;_   = allout-after-save-decrypt
-(defvar allout-after-save-decrypt nil
@@ -1574 +1618 @@
-           (setq allout-mode-map
-                 (produce-allout-mode-map allout-keybindings-list))
+           (substitute-key-definition 'beginning-of-line
+                                      'move-beginning-of-line
+                                      allout-mode-map global-map)
+           (substitute-key-definition 'end-of-line
+                                      'move-end-of-line
+                                      allout-mode-map global-map)
-           (produce-allout-mode-menubar-entries)
-           (fset 'allout-mode-map allout-mode-map)
@@ -5779 +5829 @@
-          (condition-case nil (line-move (1- arg)) (error nil)))
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-)
-;;;_  > move-end-of-line if necessary - older emacs, xemacs
@@ -5803 +5850 @@
-      (interactive "p")
-      (or arg (setq arg 1))
-
-
+
-        (while (not done)
-          (let ((newpos
@@ -5814 +5860 @@
-                          (not (bobp))
-                          (progn
-
-
+
+
+
+
-                            (backward-char 1)))
-                     (point)))))
@@ -5828 +5876 @@
-                  ;; keep going.
-                  (setq arg 1)
-
-
-
+
-  )
-;;;_  > line-move-invisible-p if necessary