Show
Ignore:
Timestamp:
05/18/06 16:19: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

    r4079 r4085  
    200200;;;###autoload 
    201201(put 'allout-show-bodies 'safe-local-variable 
    202      '(lambda (x) (member x '(t nil)))) 
     202     (if (fboundp 'booleanp) 'booleanp '(lambda (x) (member x '(t nil))))) 
    203203 
    204204;;;_  = allout-header-prefix 
    …… 
    346346;;;###autoload 
    347347(put 'allout-old-style-prefixes 'safe-local-variable 
    348      '(lambda (x) (member x '(t nil)))) 
     348     (if (fboundp 'booleanp) 'booleanp '(lambda (x) (member x '(t nil))))) 
    349349;;;_  = allout-stylish-prefixes - alternating bullets 
    350350(defcustom allout-stylish-prefixes t 
    …… 
    395395;;;###autoload 
    396396(put 'allout-stylish-prefixes 'safe-local-variable 
    397      '(lambda (x) (member x '(t nil)))) 
     397     (if (fboundp 'booleanp) 'booleanp '(lambda (x) (member x '(t nil))))) 
    398398 
    399399;;;_  = allout-numbered-bullet 
    …… 
    409409(make-variable-buffer-local 'allout-numbered-bullet) 
    410410;;;###autoload 
    411 (put 'allout-numbered-bullet 'safe-local-variable 'string-or-null-p) 
     411(put 'allout-numbered-bullet 'safe-local-variable 
     412     (if (fboundp 'string-or-null-p) 
     413         'string-or-null-p 
     414       '(lambda (x) (or (stringp x) (null x))))) 
    412415;;;_  = allout-file-xref-bullet 
    413416(defcustom allout-file-xref-bullet "@" 
    …… 
    418421  :group 'allout) 
    419422;;;###autoload 
    420 (put 'allout-file-xref-bullet 'safe-local-variable 'string-or-null-p) 
     423(put 'allout-file-xref-bullet 'safe-local-variable 
     424     (if (fboundp 'string-or-null-p) 
     425         'string-or-null-p 
     426       '(lambda (x) (or (stringp x) (null x))))) 
    421427;;;_  = allout-presentation-padding 
    422428(defcustom allout-presentation-padding 2 
    …… 
    621627;;;###autoload 
    622628(put 'allout-use-hanging-indents 'safe-local-variable 
    623      '(lambda (x) (member x '(t nil)))) 
     629     (if (fboundp 'booleanp) 'booleanp '(lambda (x) (member x '(t nil))))) 
    624630 
    625631;;;_  = allout-reindent-bodies 
    …… 
    10681074 
    10691075Switch to using `allout-exposure-change-hook' instead.  Both 
    1070 variables are currently used if populated, but this one will be 
    1071 ignored in a subsequent allout version.") 
     1076variables are currently respected, but this one will be ignored 
     1077in a subsequent allout version.") 
    10721078;;;_   = allout-exposure-change-hook 
    10731079(defvar allout-exposure-change-hook nil 
    …… 
    10751081 
    10761082This variable will replace `allout-view-change-hook' in a subsequent allout 
    1077 version, though both are currently checked and used, if populated.") 
     1083version, though both are currently respected.") 
    10781084 
    10791085;;;_   = allout-outside-normal-auto-fill-function 
    …… 
    17621768          (ol-start (overlay-start ol)) 
    17631769          (ol-end (overlay-end ol)) 
    1764           (msg "Change within concealed text disallowed.") 
    1765           opened 
    17661770          first) 
    17671771      (goto-char beg) 
    …… 
    17731777                              (allout-show-to-offshoot))) 
    17741778          (when (not first) 
    1775             (setq opened t) 
    17761779            (setq first (point)))) 
    17771780        (goto-char (if (featurep 'xemacs) 
    …… 
    40094012  "True if the currently visible containing topic is already collapsed. 
    40104013 
    4011 If optional INCLUDE-SINGLE-LINERS is true, then include single-line 
    4012 topics \(which intrinsically can be considered both collapsed and 
    4013 not\), as collapsed.  Otherwise they are considered uncollapsed." 
     4014Single line topics intrinsically can be considered as being both 
     4015collapsed and uncollapsed.  If optional INCLUDE-SINGLE-LINERS is 
     4016true, then single-line topics are considered to be collapsed.  By 
     4017default, they are treated as being uncollapsed." 
    40144018  (save-excursion 
    4015       (and 
    4016        (= (progn (allout-back-to-current-heading) 
    4017                  (move-end-of-line 1) 
    4018                  (point)) 
    4019           (allout-end-of-current-subtree)) 
    4020        (or include-single-liners 
    4021            (progn (backward-char 1) (allout-hidden-p)))))) 
     4019    (and 
     4020     (= (progn (allout-back-to-current-heading) 
     4021               (move-end-of-line 1) 
     4022               (point)) 
     4023        (allout-end-of-current-subtree (not (looking-at "\n\n")))) 
     4024     (or include-single-liners 
     4025         (progn (backward-char 1) (allout-hidden-p)))))) 
    40224026;;;_   > allout-hide-current-subtree (&optional just-close) 
    40234027(defun allout-hide-current-subtree (&optional just-close)