From: Juanma Barranquero <lekktu@gmail.com>
Date: Thu, 20 Jun 2013 10:28:23 +0000 (+0200)
Subject: Revert 2013-06-20T00:39:59Z!lekktu@gmail.com.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~2016^2~29
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=01a439012b9393e1325ab983dfcebad0307f0a03;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 748b8ca5939..773f8913533 100644
--- 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 a4b3c11d7d8..b3ed328bd72 100644
--- 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)