Show
Ignore:
Timestamp:
09/30/06 09:12:06 (2 years ago)
Author:
miyoshi
Message:

Sync up with Emacs CVS HEAD.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/lisp

    • Property svn:ignore changed from
      *.elc
      MANIFEST
      Makefile
      Makefile.unix
      makefile
      elc.tar.gz
      cus-load.el
      finder-inf.el
      subdirs.el
      loaddefs.el
      to
      *.elc
      MANIFEST
      Makefile
      Makefile.unix
      makefile
      elc.tar.gz
      cus-load.el
      finder-inf.el
      subdirs.el
      loaddefs.el
      pre-mh-loaddefs.el-CMD
  • trunk/lisp/cus-edit.el

    r4166 r4169  
    15221522        (widget-insert (format ". 
    15231523%s buttons; type RET or click mouse-1 to actuate one. 
    1524 Editing a setting changes only the text in the buffer. 
    1525 Use the setting's State button to set it or save changes in it. 
    1526 Saving a change normally works by editing your Emacs init file. 
    1527 See " 
     1524Editing a setting changes only the text in the buffer." 
    15281525                               (if custom-raised-buttons 
    15291526                                   "`Raised' text indicates" 
    15301527                                 "Square brackets indicate"))) 
     1528        (if init-file-user 
     1529            (widget-insert " 
     1530Use the setting's State button to set it or save changes in it. 
     1531Saving a change normally works by editing your Emacs init file.") 
     1532            (widget-insert " 
     1533\nSince you started Emacs with `-q', which inhibits use of the 
     1534Emacs init file, you cannot save settings into the Emacs init file.")) 
     1535        (widget-insert "\nSee ") 
    15311536        (widget-create 'custom-manual 
    15321537                       :tag "Custom file" 
     
    41534158         (old-buffer (find-buffer-visiting filename))) 
    41544159    (with-current-buffer (or old-buffer (find-file-noselect filename)) 
     4160      (unless (eq major-mode 'emacs-lisp-mode) 
     4161        (emacs-lisp-mode)) 
    41554162      (let ((inhibit-read-only t)) 
    41564163        (custom-save-variables)