emacs: lisp/allout.el comparison

comparison lisp/allout.el @ 70244:ccd02e1ca0e3

Remove local autoload declaration for pgg-gpg-symmetric-key-p, since that's now done in pgg-gpg.el. (allout-show-bodies, allout-header-prefix, allout-primary-bullet) (allout-plain-bullets-string, allout-distinctive-bullets-string) (allout-use-mode-specific-leader, allout-old-style-prefixes) (allout-stylish-prefixes, allout-numbered-bullet) (allout-file-xref-bullet, allout-presentation-padding) (allout-use-hanging-indents, allout-reindent-bodies): Mark as safe-local-variable with suitable value spec, and add autoload cookie for loaddefs inclusion. We now use an explicit spec everywhere. (move-beginning-of-line, move-end-of-line): Repair so these compat functions now actually resituate the point, when appropriate.

author	Stefan Monnier <monnier@iro.umontreal.ca>
date	Wed, 26 Apr 2006 21:54:51 +0000
parents	81a284d45346
children	12b22e9828df 966a40e7fb54

comparison

equal deleted inserted replaced

-:040cb1efa4bc
+:ccd02e1ca0e3
 (require 'overlay)
 (eval-when-compile (progn (require 'pgg)
 (require 'pgg-gpg)
 (require 'overlay)
 			  ))
-(autoload 'pgg-gpg-symmetric-key-p "pgg-gpg"
-"True if decoded armor MESSAGE-KEYS has symmetric encryption indicator.")
 ;;;_* USER CUSTOMIZATION VARIABLES:
 ;;;_ > defgroup allout
 (defgroup allout nil
 "*If non-nil, show entire body when exposing a topic, rather than
 just the header."
 :type 'boolean
 :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
 (defcustom allout-header-prefix "."
 "*Leading string which helps distinguish topic headers.
 character, which is typically set to the `allout-primary-bullet'.  Many
 outlines start at level 2 to avoid this discrepancy."
 :type 'string
 :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 "*"
 "Bullet used for top-level outline topics.
 Outline topic header lines are identified by a leading topic header
 and `allout-distinctive-bullets-string' for the range of available
 bullets."
 :type 'string
 :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 ".,"
 "*The bullets normally used in outline topic prefixes.
 See `allout-distinctive-bullets-string' for the other kind of
 Outline mode has to be reactivated in order for changes to the value
 of this var to take effect."
 :type 'string
 :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@$~_\\:;^"
 "*Persistent outline header bullets used to distinguish special topics.
 These bullets are used to distinguish topics from the run-of-the-mill
 DO NOT include the close-square-bracket, `]', on either of the bullet
 strings."
 :type 'string
 :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
 (defcustom allout-use-mode-specific-leader t
 "*When non-nil, use mode-specific topic-header prefixes.
 \(See note about use of comment-start strings, below.)
 Set to the symbol for either of `allout-mode-leaders' or
 `comment-start' to use only one of them, respectively.
-Value nil means to always use the default \(`.').
+Value nil means to always use the default \(`.').t
 comment-start strings that do not end in spaces are tripled, and an
 `_' underscore is tacked on the end, to distinguish them from regular
 comment strings.  comment-start strings that do end in spaces are not
 tripled, but an underscore is substituted for the space. [This
 incorrect.]"
 :type '(choice (const t) (const nil) string
 		 (const allout-mode-leaders)
 		 (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 '()
 "Specific allout-prefix leading strings per major modes.
 Entries will be used instead or in lieu of mode-specific
 Whatever the setting of this variable, both old and new style prefixes
 are always respected by the topic maneuvering functions."
 :type 'boolean
 :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
 "*Do fancy stuff with topic prefix bullets according to level, etc.
 Non-nil enables topic creation, modification, and repositioning
 The setting of this var is not relevant when `allout-old-style-prefixes'
 is non-nil."
 :type 'boolean
 :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
 (defcustom allout-numbered-bullet "#"
 "*String designating bullet of topics that have auto-numbering; nil for none.
 to \"#\", you can set it to a bullet of your choice.  A nil value
 disables numbering maintenance."
 :type '(choice (const nil) string)
 :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 "@"
 "*Bullet signifying file cross-references, for `allout-resolve-xref'.
 Set this var to the bullet you want to use for file cross-references."
 :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
 "*Presentation-format white-space padding factor, for greater indent."
 :type 'integer
 :group 'allout)
 (make-variable-buffer-local 'allout-presentation-padding)
+;;;###autoload
+(put 'allout-presentation-padding 'safe-local-variable 'integerp)
 ;;;_  = allout-abbreviate-flattened-numbering
 (defcustom allout-abbreviate-flattened-numbering nil
 "*If non-nil, `allout-flatten-exposed-to-buffer' abbreviates topic
 numbers to minimal amount with some context.  Otherwise, entire
 "*LaTeX formatted depth-indent spacing."
 :type 'string
 :group 'allout)
 ;;;_ + 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)
-:group 'allout)
+:version "22.0"
+:group 'allout-encryption)
 ;;;_  = allout-passphrase-verifier-handling
 (defcustom allout-passphrase-verifier-handling t
 "*Enable use of symmetric encryption passphrase verifier if non-nil.
 See the docstring for the `allout-enable-file-variable-adjustment'
 variable for details about allout ajustment of file variables."
 :type 'boolean
-:group 'allout)
+:version "22.0"
+:group 'allout-encryption)
 (make-variable-buffer-local 'allout-passphrase-verifier-handling)
 ;;;_  = allout-passphrase-hint-handling
 (defcustom allout-passphrase-hint-handling 'always
 "*Dictate outline encryption passphrase reminder handling:
 See the docstring for the `allout-enable-file-variable-adjustment'
 variable for details about allout ajustment of file variables."
 :type '(choice (const always)
 (const needed)
 (const disabled))
-:group 'allout)
+:version "22.0"
+:group 'allout-encryption)
 (make-variable-buffer-local 'allout-passphrase-hint-handling)
 ;;;_  = allout-encrypt-unencrypted-on-saves
 (defcustom allout-encrypt-unencrypted-on-saves t
 "*When saving, should topics pending encryption be encrypted?
 disable auto-saves for that file."
 :type '(choice (const :tag "Yes" t)
 (const :tag "All except current topic" except-current)
 (const :tag "No" nil))
-:group 'allout)
+:version "22.0"
+:group 'allout-encryption)
 (make-variable-buffer-local 'allout-encrypt-unencrypted-on-saves)
 ;;;_ + Miscellaneous customization
 ;;;_  = allout-command-prefix
 relevant mostly for use with indented-text-mode, or other situations
 where auto-fill occurs."
 :type 'boolean
 :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
 (defcustom allout-reindent-bodies (if allout-use-hanging-indents
 				    'text)
 "*Non-nil enables auto-adjust of topic body hanging indent with depth shifts.
 `force' enables reindent whether or not `comment-start' is set."
 :type '(choice (const nil) (const t) (const text) (const force))
 :group 'allout)
 (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
 (defcustom allout-enable-file-variable-adjustment t
 "*If non-nil, some allout outline actions edit Emacs local file var text.
 `allout-default-layout' describes the specification format.
 `allout-layout' can additionally have the value `t', in which
 case the value of `allout-default-layout' is used.")
 (make-variable-buffer-local 'allout-layout)
 ;;;###autoload
-(put 'allout-layout 'safe-local-variable (lambda (x) (or (listp x) (symbolp x))))
+(put 'allout-layout 'safe-local-variable
+(lambda (x) (or (numberp x) (listp x) (integerp x)
+(member x '(: * + -)))))
 ;;;_  : Topic header format
 ;;;_   = allout-regexp
 (defvar allout-regexp ""
 "*Regular expression to match the beginning of a heading line.
 The verifier string is retained as an Emacs file variable, as well as in
 the emacs buffer state, if file variable adjustments are enabled.  See
 `allout-enable-file-variable-adjustment' for details about that.")
 (make-variable-buffer-local 'allout-passphrase-verifier-string)
+;;;###autoload
 (put 'allout-passphrase-verifier-string 'safe-local-variable 'stringp)
 ;;;_   = allout-passphrase-hint-string
 (defvar allout-passphrase-hint-string ""
 "Variable used to retain reminder string for file's encryption passphrase.
 The hint is retained as an Emacs file variable, as well as in the emacs buffer
 state, if file variable adjustments are enabled.  See
 `allout-enable-file-variable-adjustment' for details about that.")
 (make-variable-buffer-local 'allout-passphrase-hint-string)
+(setq-default allout-passphrase-hint-string "")
+;;;###autoload
 (put 'allout-passphrase-hint-string 'safe-local-variable 'stringp)
-(setq-default allout-passphrase-hint-string "")
 ;;;_   = allout-after-save-decrypt
 (defvar allout-after-save-decrypt nil
 "Internal variable, is nil or has the value of two points:
 - the location of a topic to be decrypted after saving is done
 	  (progn			; V19, and maybe lucid and
 				       ; epoch, minor-mode key bindings:
 	   (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)
 				       ; Include on minor-mode-map-alist,
 				       ; if not already there:
 	   (if (not (member '(allout-mode . allout-mode-map)
 (interactive "p")
 (or arg (setq arg 1))
 (if (/= arg 1)
 (condition-case nil (line-move (1- arg)) (error nil)))
-(let ((orig (point)))
+;; Move to beginning-of-line, ignoring fields and invisibles.
-;; Move to beginning-of-line, ignoring fields and invisibles.
+(skip-chars-backward "^\n")
-(skip-chars-backward "^\n")
+(while (and (not (bobp)) (line-move-invisible-p (1- (point))))
-(while (and (not (bobp)) (line-move-invisible-p (1- (point))))
+(goto-char (if (featurep 'xemacs)
-(goto-char (if (featurep 'xemacs)
+(previous-property-change (point))
-(previous-property-change (point))
+(previous-char-property-change (point))))
-(previous-char-property-change (point))))
+(skip-chars-backward "^\n"))
-(skip-chars-backward "^\n"))
+(vertical-motion 0))
-(vertical-motion 0)
-(if (/= orig (point))
-(goto-char orig))))
 )
 ;;;_  > move-end-of-line if necessary - older emacs, xemacs
 (if (not (fboundp 'move-end-of-line))
 (defun move-end-of-line (arg)
 "Move point to end of current line as displayed.
 With argument ARG not nil or 1, move forward ARG - 1 lines first.
 If point reaches the beginning or end of buffer, it stops there.
 To ignore intangibility, bind `inhibit-point-motion-hooks' to t."
 (interactive "p")
 (or arg (setq arg 1))
-(let ((orig (point))
+(let (done)
-done)
 (while (not done)
 (let ((newpos
 (save-excursion
 (let ((goal-column 0))
 (and (condition-case nil
 (or (line-move arg) t)
 (error nil))
 (not (bobp))
 (progn
-(while (and (not (bobp)) (line-move-invisible-p (1- (point))))
+(while (and (not (bobp))
-(goto-char (previous-char-property-change (point))))
+(line-move-invisible-p (1- (point))))
+(goto-char
+(previous-char-property-change (point))))
 (backward-char 1)))
 (point)))))
 (goto-char newpos)
 (if (and (> (point) newpos)
 (eq (preceding-char) ?\n))
 (not (eq (following-char) ?\n)))
 ;; If we skipped something intangible
 ;; and now we're not really at eol,
 ;; keep going.
 (setq arg 1)
-(setq done t)))))
+(setq done t)))))))
-(if (/= orig (point))
-(goto-char orig))))
 )
 ;;;_  > line-move-invisible-p if necessary
 (if (not (fboundp 'line-move-invisible-p))
 (defun line-move-invisible-p (pos)
 "Return non-nil if the character after POS is currently invisible."

Mercurial > emacs

comparison lisp/allout.el @ 70244:ccd02e1ca0e3