[Emacs-diffs] emacs/lisp ChangeLog composite.el custom.el epa...

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/09/13 00:53:01

Modified files:
        lisp           : ChangeLog composite.el custom.el epa-hook.el 
                         files.el font-core.el frame.el rfn-eshadow.el 
                         simple.el startup.el tooltip.el 
        lisp/mail      : sendmail.el 

Log message:
        * mail/sendmail.el (send-mail-function):
        * tooltip.el (tooltip-mode):
        * simple.el (transient-mark-mode):
        * rfn-eshadow.el (file-name-shadow-mode):
        * frame.el (blink-cursor-mode):
        * font-core.el (global-font-lock-mode):
        * files.el (temporary-file-directory)
        (small-temporary-file-directory, auto-save-file-name-transforms):
        * epa-hook.el (auto-encryption-mode):
        * composite.el (global-auto-composition-mode):
        Use custom-initialize-delay.
        * startup.el (command-line): Don't explicitly call
        custom-reevaluate-setting for all the above vars.
        * custom.el (custom-initialize-safe-set)
        (custom-initialize-safe-default): Delete.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16153&r2=1.16154
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/composite.el?cvsroot=emacs&r1=1.48&r2=1.49
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/custom.el?cvsroot=emacs&r1=1.147&r2=1.148
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/epa-hook.el?cvsroot=emacs&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/files.el?cvsroot=emacs&r1=1.1080&r2=1.1081
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/font-core.el?cvsroot=emacs&r1=1.56&r2=1.57
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/frame.el?cvsroot=emacs&r1=1.300&r2=1.301
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/rfn-eshadow.el?cvsroot=emacs&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/simple.el?cvsroot=emacs&r1=1.1010&r2=1.1011
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/startup.el?cvsroot=emacs&r1=1.542&r2=1.543
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/tooltip.el?cvsroot=emacs&r1=1.94&r2=1.95
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mail/sendmail.el?cvsroot=emacs&r1=1.330&r2=1.331

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16153
retrieving revision 1.16154
diff -u -b -r1.16153 -r1.16154
--- ChangeLog   12 Sep 2009 22:32:52 -0000      1.16153
+++ ChangeLog   13 Sep 2009 00:52:55 -0000      1.16154
@@ -1,3 +1,21 @@
+2009-09-13  Stefan Monnier  <address@hidden>
+
+       * mail/sendmail.el (send-mail-function):
+       * tooltip.el (tooltip-mode):
+       * simple.el (transient-mark-mode):
+       * rfn-eshadow.el (file-name-shadow-mode):
+       * frame.el (blink-cursor-mode):
+       * font-core.el (global-font-lock-mode):
+       * files.el (temporary-file-directory)
+       (small-temporary-file-directory, auto-save-file-name-transforms):
+       * epa-hook.el (auto-encryption-mode):
+       * composite.el (global-auto-composition-mode):
+       Use custom-initialize-delay.
+       * startup.el (command-line): Don't explicitly call
+       custom-reevaluate-setting for all the above vars.
+       * custom.el (custom-initialize-safe-set)
+       (custom-initialize-safe-default): Delete.
+
 2009-09-12  Stefan Monnier  <address@hidden>
 
        * term/x-win.el (x-initialize-window-system):

Index: composite.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/composite.el,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- composite.el        16 Jun 2009 00:33:18 -0000      1.48
+++ composite.el        13 Sep 2009 00:52:59 -0000      1.49
@@ -773,8 +773,10 @@
 ;;;###autoload
 (define-global-minor-mode global-auto-composition-mode
   auto-composition-mode turn-on-auto-composition-if-enabled
-  :extra-args (dummy)
-  :initialize 'custom-initialize-safe-default
+  ;; This :extra-args' appears to be the result of a naive copy&paste
+  ;; from global-font-lock-mode.
+  ;; :extra-args (dummy)
+  :initialize 'custom-initialize-delay
   :init-value (not noninteractive)
   :group 'auto-composition
   :version "23.1")

Index: custom.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/custom.el,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -b -r1.147 -r1.148
--- custom.el   11 Sep 2009 21:25:47 -0000      1.147
+++ custom.el   13 Sep 2009 00:52:59 -0000      1.148
@@ -74,28 +74,6 @@
                 (eval (car (get symbol 'saved-value)))
               (eval value)))))
 
-(defun custom-initialize-safe-set (symbol value)
-  "Like `custom-initialize-set', but catches errors.
-If an error occurs during initialization, SYMBOL is set to nil
-and no error is thrown.  This is meant for use in pre-loaded files
-where some variables or functions used to compute VALUE may not yet
-be defined.  You can then re-evaluate VALUE in startup.el, for instance
-using `custom-reevaluate-setting'."
-  (condition-case nil
-      (custom-initialize-set symbol value)
-    (error (set-default symbol nil))))
-
-(defun custom-initialize-safe-default (symbol value)
-  "Like `custom-initialize-default', but catches errors.
-If an error occurs during initialization, SYMBOL is set to nil
-and no error is thrown.  This is meant for use in pre-loaded files
-where some variables or functions used to compute VALUE may not yet
-be defined.  You can then re-evaluate VALUE in startup.el, for instance
-using `custom-reevaluate-setting'."
-  (condition-case nil
-      (custom-initialize-default symbol value)
-    (error (set-default symbol nil))))
-
 (defun custom-initialize-reset (symbol value)
   "Initialize SYMBOL based on VALUE.
 Set the symbol, using its `:set' function (or `set-default' if it has none).
@@ -139,6 +117,10 @@
 done in the run-time context rather than the build-time context.
 This also has the side-effect that the (delayed) initialization is performed
 with the :setter."
+  ;; Until the var is actually initialized, it is kept unbound.
+  ;; This seemed to be at least as good as setting it to an arbitrary
+  ;; value like nil (evaluating `value' is not an option because it
+  ;; may have undesirable side-effects).
   (push symbol custom-delayed-init-variables))
 
 (defun custom-declare-variable (symbol default doc &rest args)

Index: epa-hook.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/epa-hook.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- epa-hook.el 5 Jan 2009 03:19:05 -0000       1.5
+++ epa-hook.el 13 Sep 2009 00:53:00 -0000      1.6
@@ -86,6 +86,11 @@
 With prefix argument ARG, turn auto encryption on if positive, else off.
 Return the new status of auto encryption (non-nil means on)."
   :global t :init-value t :group 'epa-file :version "23.1"
+  ;; We'd like to use custom-initialize-set here so the setup is done
+  ;; before dumping, but at the point where the defcustom is evaluated,
+  ;; the corresponding function isn't defined yet, so
+  ;; custom-initialize-set signals an error.
+  :initialize 'custom-initialize-delay
   (setq file-name-handler-alist
        (delq epa-file-handler file-name-handler-alist))
   (remove-hook 'find-file-hooks 'epa-file-find-file-hook)

Index: files.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/files.el,v
retrieving revision 1.1080
retrieving revision 1.1081
diff -u -b -r1.1080 -r1.1081
--- files.el    7 Sep 2009 15:23:12 -0000       1.1080
+++ files.el    13 Sep 2009 00:53:00 -0000      1.1081
@@ -195,6 +195,7 @@
          (or (getenv "TMPDIR") (getenv "TMP") (getenv "TEMP") "/tmp"))))
   "The directory for writing temporary files."
   :group 'files
+  :initialize 'custom-initialize-delay
   :type 'directory)
 
 (defcustom small-temporary-file-directory
@@ -204,6 +205,7 @@
 by programs that create small temporary files.  This is for systems that
 have fast storage with limited space, such as a RAM disk."
   :group 'files
+  :initialize 'custom-initialize-delay
   :type '(choice (const nil) directory))
 
 ;; The system null device. (Should reference NULL_DEVICE from C.)
@@ -385,6 +387,7 @@
   :group 'auto-save
   :type '(repeat (list (string :tag "Regexp") (string :tag "Replacement")
                                           (boolean :tag "Uniquify")))
+  :initialize 'custom-initialize-delay
   :version "21.1")
 
 (defcustom save-abbrevs t

Index: font-core.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/font-core.el,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- font-core.el        26 Aug 2009 03:07:25 -0000      1.56
+++ font-core.el        13 Sep 2009 00:53:00 -0000      1.57
@@ -299,8 +299,9 @@
 
 (define-globalized-minor-mode global-font-lock-mode
   font-lock-mode turn-on-font-lock-if-desired
-  :extra-args (dummy)
-  :initialize 'custom-initialize-safe-default
+  ;; What was this :extra-args thingy for?  --Stef
+  ;; :extra-args (dummy)
+  :initialize 'custom-initialize-delay
   :init-value (not (or noninteractive emacs-basic-display))
   :group 'font-lock
   :version "22.1")

Index: frame.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/frame.el,v
retrieving revision 1.300
retrieving revision 1.301
diff -u -b -r1.300 -r1.301
--- frame.el    26 Jul 2009 19:20:51 -0000      1.300
+++ frame.el    13 Sep 2009 00:53:00 -0000      1.301
@@ -1605,7 +1605,7 @@
                       no-blinking-cursor
                       (eq system-type 'ms-dos)
                       (not (memq window-system '(x w32)))))
-  :initialize 'custom-initialize-safe-default
+  :initialize 'custom-initialize-delay
   :group 'cursor
   :global t
   (if blink-cursor-idle-timer (cancel-timer blink-cursor-idle-timer))

Index: rfn-eshadow.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/rfn-eshadow.el,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- rfn-eshadow.el      5 Jan 2009 03:19:43 -0000       1.29
+++ rfn-eshadow.el      13 Sep 2009 00:53:00 -0000      1.30
@@ -216,6 +216,11 @@
 With prefix argument ARG, turn on if positive, otherwise off.
 Returns non-nil if the new state is enabled."
   :global t
+  ;; We'd like to use custom-initialize-set here so the setup is done
+  ;; before dumping, but at the point where the defcustom is evaluated,
+  ;; the corresponding function isn't defined yet, so
+  ;; custom-initialize-set signals an error.
+  :initialize 'custom-initialize-delay
   :init-value t
   :group 'minibuffer
   :version "22.1"

Index: simple.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/simple.el,v
retrieving revision 1.1010
retrieving revision 1.1011
diff -u -b -r1.1010 -r1.1011
--- simple.el   11 Sep 2009 00:59:04 -0000      1.1010
+++ simple.el   13 Sep 2009 00:53:00 -0000      1.1011
@@ -3898,6 +3898,7 @@
 commands which are sensitive to the Transient Mark mode."
   :global t
   :init-value (not noninteractive)
+  :initialize 'custom-initialize-delay
   :group 'editing-basics)
 
 ;; The variable transient-mark-mode is ugly: it can take on special

Index: startup.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/startup.el,v
retrieving revision 1.542
retrieving revision 1.543
diff -u -b -r1.542 -r1.543
--- startup.el  12 Sep 2009 04:38:06 -0000      1.542
+++ startup.el  13 Sep 2009 00:53:00 -0000      1.543
@@ -698,10 +698,6 @@
        after-init-time nil
         command-line-default-directory default-directory)
 
-  ;; Choose a reasonable location for temporary files.
-  (custom-reevaluate-setting 'temporary-file-directory)
-  (custom-reevaluate-setting 'small-temporary-file-directory)
-  (custom-reevaluate-setting 'auto-save-file-name-transforms)
   ;; Force recomputation, in case it was computed during the dump.
   (setq abbreviated-home-dir nil)
 
@@ -915,18 +911,6 @@
         (prog1 (nreverse custom-delayed-init-variables)
           (setq custom-delayed-init-variables nil)))
   
-  ;; Can't do this init in defcustom because the relevant variables
-  ;; are not set.
-  (custom-reevaluate-setting 'blink-cursor-mode)
-  (custom-reevaluate-setting 'tooltip-mode)
-  (custom-reevaluate-setting 'global-font-lock-mode)
-  (custom-reevaluate-setting 'file-name-shadow-mode)
-  (custom-reevaluate-setting 'send-mail-function)
-  (custom-reevaluate-setting 'focus-follows-mouse)
-  (custom-reevaluate-setting 'global-auto-composition-mode)
-  (custom-reevaluate-setting 'transient-mark-mode)
-  (custom-reevaluate-setting 'auto-encryption-mode)
-
   (normal-erase-is-backspace-setup-frame)
 
   ;; Register default TTY colors for the case the terminal hasn't a

Index: tooltip.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/tooltip.el,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -b -r1.94 -r1.95
--- tooltip.el  28 Apr 2009 02:16:56 -0000      1.94
+++ tooltip.el  13 Sep 2009 00:53:01 -0000      1.95
@@ -52,7 +52,7 @@
   ;; Even if we start on a text-only terminal, make this non-nil by
   ;; default because we can open a graphical frame later (multi-tty).
   :init-value t
-  :initialize 'custom-initialize-safe-default
+  :initialize 'custom-initialize-delay
   :group 'tooltip
   (unless (or (null tooltip-mode) (fboundp 'x-show-tip))
     (error "Sorry, tooltips are not yet available on this system"))

Index: mail/sendmail.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/mail/sendmail.el,v
retrieving revision 1.330
retrieving revision 1.331
diff -u -b -r1.330 -r1.331
--- mail/sendmail.el    3 Sep 2009 06:55:02 -0000       1.330
+++ mail/sendmail.el    13 Sep 2009 00:53:01 -0000      1.331
@@ -168,6 +168,7 @@
                (function-item feedmail-send-it :tag "Use Feedmail package")
                (function-item mailclient-send-it :tag "Use Mailclient package")
                function)
+  :initialize 'custom-initialize-delay
   :group 'sendmail)
 
 ;;;###autoload