Show
Ignore:
Timestamp:
05/03/06 18:37:43 (3 years ago)
Author:
miyoshi
Message:

Sync up with Emacs CVS HEAD.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk

    • Property svn:ignore changed from
      bin
       to
      bin
      site-lisp

  • trunk/lisp/abbrev.el

    r4058 r4073  
    5959  :type 'boolean 
    6060  :group 'abbrev-mode) 
    61 ;;;###autoload(put 'abbrev-mode 'safe-local-variable t) 
     61;;;###autoload(put 'abbrev-mode 'safe-local-variable 'booleanp) 
    6262 
    6363  
    …… 
    161161  "Redefine abbrevs according to current buffer contents." 
    162162  (interactive) 
    163   (define-abbrevs t) 
    164   (set-buffer-modified-p nil)) 
     163  (save-restriction 
     164    (widen) 
     165    (define-abbrevs t) 
     166    (set-buffer-modified-p nil))) 
    165167 
    166168(defun define-abbrevs (&optional arg) 
    …… 
    196198it defaults to the value of `abbrev-file-name'. 
    197199Optional second argument QUIETLY non-nil means don't display a message." 
    198   (interactive "fRead abbrev file: ") 
    199   (load (if (and file (> (length file) 0)) file abbrev-file-name) 
    200         nil quietly) 
     200  (interactive 
     201   (list 
     202    (read-file-name (format "Read abbrev file (default %s): " 
     203                            abbrev-file-name) 
     204                    nil abbrev-file-name t))) 
     205  (load (or file abbrev-file-name) nil quietly) 
    201206  (setq abbrevs-changed nil)) 
    202207 
    …… 
    359364                (expand-abbrev))))))) 
    360365 
    361 ;;; arch-tag: dbd6f3ae-dfe3-40ba-b00f-f9e3ff960df5 
     366;; arch-tag: dbd6f3ae-dfe3-40ba-b00f-f9e3ff960df5 
    362367;;; abbrev.el ends here