(derived-mode-run-hooks): Remove.

[gnu-emacs] / lisp / frame.el

diff --git a/lisp/frame.el b/lisp/frame.el
index 6b69dead4141f82dc5a20177ae92842b8a636f8c..5496c857af0ca0949d0fc5738904166ad6a07956 100644 (file)
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -1256,10 +1256,6 @@ The function `blink-cursor-start' is called when the timer fires.")
 This timer calls `blink-cursor-timer-function' every
 `blink-cursor-interval' seconds.")
 
-;; We do not know the standard _evaluated_ value yet, because the standard
-;; expression uses values that are not yet set.  The correct evaluated
-;; standard value will be installed in startup.el using exactly the same
-;; expression as in the defcustom.
 (define-minor-mode blink-cursor-mode
   "Toggle blinking cursor mode.
 With a numeric argument, turn blinking cursor mode on iff ARG is positive.
@@ -1270,9 +1266,10 @@ Note that this command is effective only when Emacs
 displays through a window system, because then Emacs does its own
 cursor display.  On a text-only terminal, this is not implemented."
   :init-value (not (or noninteractive
-                      (if (boundp 'no-blinking-cursor) no-blinking-cursor)
+                      no-blinking-cursor
                       (eq system-type 'ms-dos)
                       (not (memq window-system '(x w32)))))
+  :initialize 'custom-initialize-safe-default
   :group 'cursor
   :global t
   (if blink-cursor-idle-timer (cancel-timer blink-cursor-idle-timer))