Show
Ignore:
Timestamp:
05/13/06 11:31:18 (3 years ago)
Author:
miyoshi
Message:

Sync up with Emacs CVS HEAD.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lisp/allout.el

    r4073 r4079  
    200200;;;###autoload 
    201201(put 'allout-show-bodies 'safe-local-variable 
    202      (lambda (x) (member x '(t nil)))) 
     202     '(lambda (x) (member x '(t nil)))) 
    203203 
    204204;;;_  = allout-header-prefix 
    …… 
    317317;;;###autoload 
    318318(put 'allout-use-mode-specific-leader 'safe-local-variable 
    319      (lambda (x) (or (member x '(t nil)) (stringp x)))) 
     319     '(lambda (x) (or (memq x '(t nil allout-mode-leaders comment-start)) 
     320                      (stringp x)))) 
    320321;;;_  = allout-mode-leaders 
    321322(defvar allout-mode-leaders '() 
    …… 
    345346;;;###autoload 
    346347(put 'allout-old-style-prefixes 'safe-local-variable 
    347      (lambda (x) (member x '(t nil)))) 
     348     '(lambda (x) (member x '(t nil)))) 
    348349;;;_  = allout-stylish-prefixes - alternating bullets 
    349350(defcustom allout-stylish-prefixes t 
    …… 
    394395;;;###autoload 
    395396(put 'allout-stylish-prefixes 'safe-local-variable 
    396      (lambda (x) (member x '(t nil)))) 
     397     '(lambda (x) (member x '(t nil)))) 
    397398 
    398399;;;_  = allout-numbered-bullet 
    …… 
    408409(make-variable-buffer-local 'allout-numbered-bullet) 
    409410;;;###autoload 
    410 (put 'allout-numbered-bullet 'safe-local-variable 
    411      (lambda (x) (or (not x) (stringp x)))) 
     411(put 'allout-numbered-bullet 'safe-local-variable 'string-or-null-p) 
    412412;;;_  = allout-file-xref-bullet 
    413413(defcustom allout-file-xref-bullet "@" 
    …… 
    418418  :group 'allout) 
    419419;;;###autoload 
    420 (put 'allout-file-xref-bullet 'safe-local-variable 
    421      (lambda (x) (or (not x) (stringp x)))) 
     420(put 'allout-file-xref-bullet 'safe-local-variable 'string-or-null-p) 
    422421;;;_  = allout-presentation-padding 
    423422(defcustom allout-presentation-padding 2 
    …… 
    622621;;;###autoload 
    623622(put 'allout-use-hanging-indents 'safe-local-variable 
    624      (lambda (x) (member x '(t nil)))) 
     623     '(lambda (x) (member x '(t nil)))) 
    625624 
    626625;;;_  = allout-reindent-bodies 
    …… 
    642641;;;###autoload 
    643642(put 'allout-reindent-bodies 'safe-local-variable 
    644      (lambda (x) (member x '(nil t text force)))) 
     643     '(lambda (x) (memq x '(nil t text force)))) 
    645644 
    646645;;;_  = allout-enable-file-variable-adjustment 
    …… 
    709708;;;###autoload 
    710709(put 'allout-layout 'safe-local-variable 
    711      (lambda (x) (or (numberp x) (listp x) (integerp x) 
    712                      (member x '(: * + -))))) 
     710     '(lambda (x) (or (numberp x) (listp x) (memq x '(: * + -))))) 
    713711 
    714712;;;_  : Topic header format 
    …… 
    10651063(defvar allout-overlay-category nil 
    10661064  "Symbol for use in allout invisible-text overlays as the category.") 
    1067 ;;;_   = allout-view-change-hook 
     1065;;;_   x allout-view-change-hook 
    10681066(defvar allout-view-change-hook nil 
    1069   "*Hook that's run after allout outline visibility changes.") 
     1067  "*\(Deprecated\)  Hook that's run after allout outline exposure changes. 
     1068 
     1069Switch to using `allout-exposure-change-hook' instead.  Both 
     1070variables are currently used if populated, but this one will be 
     1071ignored in a subsequent allout version.") 
     1072;;;_   = allout-exposure-change-hook 
     1073(defvar allout-exposure-change-hook nil 
     1074  "*Hook that's run after allout outline exposure changes. 
     1075 
     1076This variable will replace `allout-view-change-hook' in a subsequent allout 
     1077version, though both are currently checked and used, if populated.") 
    10701078 
    10711079;;;_   = allout-outside-normal-auto-fill-function 
    …… 
    17281736(defsubst allout-hidden-p (&optional pos) 
    17291737  "Non-nil if the character after point is invisible." 
    1730   (get-char-property (or pos (point)) 'invisible)) 
     1738  (eq (get-char-property (or pos (point)) 'invisible) 'allout)) 
    17311739 
    17321740;;;_  > allout-overlay-insert-in-front-handler (ol after beg end 
    …… 
    38323840          (while props 
    38333841            (overlay-put o (pop props) (pop props))))))) 
    3834   (run-hooks 'allout-view-change-hook)) 
     3842  (run-hooks 'allout-view-change-hook) 
     3843  (run-hooks 'allout-exposure-change-hook)) 
    38353844;;;_   > allout-flag-current-subtree (flag) 
    38363845(defun allout-flag-current-subtree (flag) 
    …… 
    58895898              (assq prop buffer-invisibility-spec)))))) 
    58905899 
    5891  
    58925900;;;_ #10 Unfinished 
    58935901;;;_  > allout-bullet-isearch (&optional bullet)