Revert 2013-06-20T00:39:59Z!lekktu@gmail.com.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 748b8ca5939f226172acb205dbe6f490346d7257..773f89135337995c48b56ee4aa74e62c5511e274 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -6,9 +6,6 @@
        (ansi-color-apply-sequence, ansi-color-map): Fix typos in docstrings.
        (ansi-color-make-color-map): Rename local var ansi-color-map to map.
 
-       * progmodes/prog-mode.el (prettify-symbols-mode)
-       (global-prettify-symbols-mode, prog-mode): Remove autoload cookies.
-
 2013-06-19  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * net/eww.el (eww-process-text-input): Display passwords as asterisks.

diff --git a/lisp/progmodes/prog-mode.el b/lisp/progmodes/prog-mode.el
index a4b3c11d7d843cd2651d6df760bc7f675bb782f4..b3ed328bd72e9abcce6be2aeb08f9e6227de1a12 100644 (file)
--- a/lisp/progmodes/prog-mode.el
+++ b/lisp/progmodes/prog-mode.el
@@ -89,6 +89,7 @@ Regexp match data 0 points to the chars."
 
 (defvar-local prettify-symbols--keywords nil)
 
+;;;###autoload
 (define-minor-mode prettify-symbols-mode
   "Toggle Prettify Symbols mode.
 With a prefix argument ARG, enable Prettify Symbols mode if ARG is
@@ -131,9 +132,11 @@ support it."
              (local-variable-p 'prettify-symbols-alist))
     (prettify-symbols-mode 1)))
 
+;;;###autoload
 (define-globalized-minor-mode global-prettify-symbols-mode
   prettify-symbols-mode turn-on-prettify-symbols-mode)
 
+;;;###autoload
 (define-derived-mode prog-mode fundamental-mode "Prog"
   "Major mode for editing programming language source code."
   (setq-local require-final-newline mode-require-final-newline)